commit 563e3edbc25c016472f9841f5af9042894e36875
author Ted Kremenek <kremenek@apple.com> Tue Jul 20 20:03:58 2010 +0000
committer Ted Kremenek <kremenek@apple.com> Tue Jul 20 20:03:58 2010 +0000
tree f1dd24fb11141462f854996a8c96a06a61b553b0
parent ab0fe8a48d1dd2c2ddad3f7a900e49e56ab1f9bc

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

llvm-svn: 108898

clang/lib/Analysis/PrintfFormatString.cpp

diff --git a/clang/lib/Analysis/PrintfFormatString.cpp b/clang/lib/Analysis/PrintfFormatString.cpp
index 9606a69..08a4c27 100644
--- a/clang/lib/Analysis/PrintfFormatString.cpp
+++ b/clang/lib/Analysis/PrintfFormatString.cpp
@@ -181,7 +181,7 @@
     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 @@
   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 @@
   }
 
   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 @@
 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 @@
     case ConversionSpecifier::GArg:
     case ConversionSpecifier::OutIntPtrArg:
     case ConversionSpecifier::cArg:
-    case ConversionSpecifier::CStrArg:
+    case ConversionSpecifier::sArg:
       return true;
     default:
       return false;
@@ -646,7 +646,7 @@
   case ConversionSpecifier::FArg:
   case ConversionSpecifier::gArg:
   case ConversionSpecifier::GArg:
-  case ConversionSpecifier::CStrArg:
+  case ConversionSpecifier::sArg:
     return true;
 
   default: