Rename analyze_printf::ConversionSpecifier::IntAsCharArg to 'cArg' to match

analagous enum in analyze_scanf.  This is prep for refactoring the logic for handling
ConversionSpecifiers for both scanf and printf.

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

diff --git a/include/clang/Analysis/Analyses/FormatString.h b/include/clang/Analysis/Analyses/FormatString.h
index d76e4f7ad03755a6fbe271f4cd3691fd8f9ef275..a64e4a56e6912242a25e076e2e65b48b65ac05e0 100644 (file)
--- a/include/clang/Analysis/Analyses/FormatString.h
+++ b/include/clang/Analysis/Analyses/FormatString.h
@@ -259,7 +259,7 @@ public:
     InvalidSpecifier = 0,
       // C99 conversion specifiers.
     dArg, // 'd'
-    IntAsCharArg,  // 'c'
+    cArg, // 'c'
     iArg, // 'i',
     oArg, // 'o',
     uArg, // 'u',

diff --git a/lib/Analysis/PrintfFormatString.cpp b/lib/Analysis/PrintfFormatString.cpp
index 584fc12002b14729e30a4c3863488ff6bc725216..9606a69e5e919a0b716155a7858acb0744ae1157 100644 (file)
--- a/lib/Analysis/PrintfFormatString.cpp
+++ b/lib/Analysis/PrintfFormatString.cpp
@@ -172,7 +172,7 @@ static PrintfSpecifierResult ParsePrintfSpecifier(FormatStringHandler &H,
     case 'G': k = ConversionSpecifier::GArg; break;
     case 'X': k = ConversionSpecifier::XArg; break;
     case 'a': k = ConversionSpecifier::aArg; break;
-    case 'c': k = ConversionSpecifier::IntAsCharArg; break;
+    case 'c': k = ConversionSpecifier::cArg; break;
     case 'd': k = ConversionSpecifier::dArg; break;
     case 'e': k = ConversionSpecifier::eArg; break;
     case 'f': k = ConversionSpecifier::fArg; break;
@@ -249,7 +249,7 @@ const char *ConversionSpecifier::toString() const {
   case GArg: return "G";
   case aArg: return "a";
   case AArg: return "A";
-  case IntAsCharArg:     return "c";
+  case cArg:     return "c";
   case CStrArg:          return "s";
   case VoidPtrArg:       return "p";
   case OutIntPtrArg:     return "n";
@@ -388,7 +388,7 @@ bool PrintfSpecifier::fixType(QualType QT) {
 
   // Set conversion specifier and disable any flags which do not apply to it.
   if (QT->isAnyCharacterType()) {
-    CS.setKind(ConversionSpecifier::IntAsCharArg);
+    CS.setKind(ConversionSpecifier::cArg);
     Precision.setHowSpecified(OptionalAmount::NotSpecified);
     HasAlternativeForm = 0;
     HasLeadingZeroes = 0;
@@ -601,7 +601,7 @@ bool PrintfSpecifier::hasValidLengthModifier() const {
     case ConversionSpecifier::gArg:
     case ConversionSpecifier::GArg:
     case ConversionSpecifier::OutIntPtrArg:
-    case ConversionSpecifier::IntAsCharArg:
+    case ConversionSpecifier::cArg:
     case ConversionSpecifier::CStrArg:
       return true;
     default: