Rename 'CStrArg' to 'sArg' for printf checking to match with the analagous enum for...

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@108898 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Analysis/Analyses/FormatString.h b/include/clang/Analysis/Analyses/FormatString.h
index a64e4a56e6912242a25e076e2e65b48b65ac05e0..be00a12bfee6e9d9d9e2bdd0e057d85db805c1fb 100644 (file)
--- a/include/clang/Analysis/Analyses/FormatString.h
+++ b/include/clang/Analysis/Analyses/FormatString.h
@@ -273,7 +273,7 @@ public:
     GArg, // 'G',
     aArg, // 'a',
     AArg, // 'A',
-    CStrArg,       // 's'
+    sArg,       // 's'
     VoidPtrArg,    // 'p'
     OutIntPtrArg,  // 'n'
     PercentArg,    // '%'

diff --git a/lib/Analysis/PrintfFormatString.cpp b/lib/Analysis/PrintfFormatString.cpp
index 9606a69e5e919a0b716155a7858acb0744ae1157..08a4c277df06c45b7e76d9fafcd1d10d22c2f55c 100644 (file)
--- a/lib/Analysis/PrintfFormatString.cpp
+++ b/lib/Analysis/PrintfFormatString.cpp
@@ -181,7 +181,7 @@ static PrintfSpecifierResult ParsePrintfSpecifier(FormatStringHandler &H,
     case 'n': k = ConversionSpecifier::OutIntPtrArg; break;
     case 'o': k = ConversionSpecifier::oArg; break;
     case 'p': k = ConversionSpecifier::VoidPtrArg;   break;
-    case 's': k = ConversionSpecifier::CStrArg;      break;
+    case 's': k = ConversionSpecifier::sArg;      break;
     case 'u': k = ConversionSpecifier::uArg; break;
     case 'x': k = ConversionSpecifier::xArg; break;
     // Mac OS X (unicode) specific
@@ -250,7 +250,7 @@ const char *ConversionSpecifier::toString() const {
   case aArg: return "a";
   case AArg: return "A";
   case cArg:     return "c";
-  case CStrArg:          return "s";
+  case sArg:          return "s";
   case VoidPtrArg:       return "p";
   case OutIntPtrArg:     return "n";
   case PercentArg:       return "%";
@@ -322,7 +322,7 @@ ArgTypeResult PrintfSpecifier::getArgType(ASTContext &Ctx) const {
   }
 
   switch (CS.getKind()) {
-    case ConversionSpecifier::CStrArg:
+    case ConversionSpecifier::sArg:
       return ArgTypeResult(LM.getKind() == LengthModifier::AsWideChar ?
           ArgTypeResult::WCStrTy : ArgTypeResult::CStrTy);
     case ConversionSpecifier::UnicodeStrArg:
@@ -343,7 +343,7 @@ ArgTypeResult PrintfSpecifier::getArgType(ASTContext &Ctx) const {
 bool PrintfSpecifier::fixType(QualType QT) {
   // Handle strings first (char *, wchar_t *)
   if (QT->isPointerType() && (QT->getPointeeType()->isAnyCharacterType())) {
-    CS.setKind(ConversionSpecifier::CStrArg);
+    CS.setKind(ConversionSpecifier::sArg);
 
     // Disable irrelevant flags
     HasAlternativeForm = 0;
@@ -602,7 +602,7 @@ bool PrintfSpecifier::hasValidLengthModifier() const {
     case ConversionSpecifier::GArg:
     case ConversionSpecifier::OutIntPtrArg:
     case ConversionSpecifier::cArg:
-    case ConversionSpecifier::CStrArg:
+    case ConversionSpecifier::sArg:
       return true;
     default:
       return false;
@@ -646,7 +646,7 @@ bool PrintfSpecifier::hasValidPrecision() const {
   case ConversionSpecifier::FArg:
   case ConversionSpecifier::gArg:
   case ConversionSpecifier::GArg:
-  case ConversionSpecifier::CStrArg:
+  case ConversionSpecifier::sArg:
     return true;
 
   default: