Rename 'VoidPtrArg' to 'pArg' in printf/scanf checking.

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

diff --git a/include/clang/Analysis/Analyses/FormatString.h b/include/clang/Analysis/Analyses/FormatString.h
index be00a12bfee6e9d9d9e2bdd0e057d85db805c1fb..2d13c59c4719d67d361e470450eaba3acbc0dcff 100644 (file)
--- a/include/clang/Analysis/Analyses/FormatString.h
+++ b/include/clang/Analysis/Analyses/FormatString.h
@@ -274,7 +274,7 @@ public:
     aArg, // 'a',
     AArg, // 'A',
     sArg,       // 's'
-    VoidPtrArg,    // 'p'
+    pArg,    // 'p'
     OutIntPtrArg,  // 'n'
     PercentArg,    // '%'
       // MacOS X unicode extensions.
@@ -463,7 +463,7 @@ public:
     aArg, // 'a',
     AArg, // 'A',
     sArg, // 's', // match sequence of non-write-space characters
-    VoidPtrArg,        // 'p'
+    pArg,        // 'p'
     cArg,              // 'c', differs from printf, writes array of characters
     ConsumedSoFarArg,  // 'n', differs from printf, writes back args consumed
     PercentArg,        // '%'

diff --git a/lib/Analysis/PrintfFormatString.cpp b/lib/Analysis/PrintfFormatString.cpp
index 08a4c277df06c45b7e76d9fafcd1d10d22c2f55c..c49fcd3e6beb8217ace52d554a1b31d2d1c5802d 100644 (file)
--- a/lib/Analysis/PrintfFormatString.cpp
+++ b/lib/Analysis/PrintfFormatString.cpp
@@ -180,7 +180,7 @@ static PrintfSpecifierResult ParsePrintfSpecifier(FormatStringHandler &H,
     case 'i': k = ConversionSpecifier::iArg; break;
     case 'n': k = ConversionSpecifier::OutIntPtrArg; break;
     case 'o': k = ConversionSpecifier::oArg; break;
-    case 'p': k = ConversionSpecifier::VoidPtrArg;   break;
+    case 'p': k = ConversionSpecifier::pArg;   break;
     case 's': k = ConversionSpecifier::sArg;      break;
     case 'u': k = ConversionSpecifier::uArg; break;
     case 'x': k = ConversionSpecifier::xArg; break;
@@ -251,7 +251,7 @@ const char *ConversionSpecifier::toString() const {
   case AArg: return "A";
   case cArg:     return "c";
   case sArg:          return "s";
-  case VoidPtrArg:       return "p";
+  case pArg:       return "p";
   case OutIntPtrArg:     return "n";
   case PercentArg:       return "%";
   case InvalidSpecifier: return NULL;
@@ -330,7 +330,7 @@ ArgTypeResult PrintfSpecifier::getArgType(ASTContext &Ctx) const {
       return ArgTypeResult::WCStrTy;
     case ConversionSpecifier::CArg:
       return Ctx.WCharTy;
-    case ConversionSpecifier::VoidPtrArg:
+    case ConversionSpecifier::pArg:
       return ArgTypeResult::CPointerTy;
     default:
       break;
@@ -399,7 +399,7 @@ bool PrintfSpecifier::fixType(QualType QT) {
     CS.setKind(ConversionSpecifier::fArg);
   }
   else if (QT->isPointerType()) {
-    CS.setKind(ConversionSpecifier::VoidPtrArg);
+    CS.setKind(ConversionSpecifier::pArg);
     Precision.setHowSpecified(OptionalAmount::NotSpecified);
     HasAlternativeForm = 0;
     HasLeadingZeroes = 0;