Rename 'UnicodeStrArg' to 'SArg'.

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

diff --git a/include/clang/Analysis/Analyses/FormatString.h b/include/clang/Analysis/Analyses/FormatString.h
index 2e1060572c5c9b2420556fd9dd984f20f858b527..a33db7d8c8ef3d45cb5a93737c141e529b265aa4 100644 (file)
--- a/include/clang/Analysis/Analyses/FormatString.h
+++ b/include/clang/Analysis/Analyses/FormatString.h
@@ -279,7 +279,7 @@ public:
     PercentArg,    // '%'
       // MacOS X unicode extensions.
     CArg, // 'C'
-    UnicodeStrArg, // 'S'
+    SArg, // 'S'
       // Objective-C specific specifiers.
     ObjCObjArg,    // '@'
       // GlibC specific specifiers.

diff --git a/lib/Analysis/PrintfFormatString.cpp b/lib/Analysis/PrintfFormatString.cpp
index dc980b3162aac7600c5124d3b8c3a7394e9b73b1..59f865799bced62fd9fe8ecf8b35e50e30dd6c39 100644 (file)
--- a/lib/Analysis/PrintfFormatString.cpp
+++ b/lib/Analysis/PrintfFormatString.cpp
@@ -186,7 +186,7 @@ static PrintfSpecifierResult ParsePrintfSpecifier(FormatStringHandler &H,
     case 'x': k = ConversionSpecifier::xArg; break;
     // Mac OS X (unicode) specific
     case 'C': k = ConversionSpecifier::CArg; break;
-    case 'S': k = ConversionSpecifier::UnicodeStrArg; break;
+    case 'S': k = ConversionSpecifier::SArg; break;
     // Objective-C.
     case '@': k = ConversionSpecifier::ObjCObjArg; break;
     // Glibc specific.
@@ -258,7 +258,7 @@ const char *ConversionSpecifier::toString() const {
 
   // MacOS X unicode extensions.
   case CArg:          return "C";
-  case UnicodeStrArg: return "S";
+  case SArg: return "S";
 
   // Objective-C specific specifiers.
   case ObjCObjArg: return "@";
@@ -325,7 +325,7 @@ ArgTypeResult PrintfSpecifier::getArgType(ASTContext &Ctx) const {
     case ConversionSpecifier::sArg:
       return ArgTypeResult(LM.getKind() == LengthModifier::AsWideChar ?
           ArgTypeResult::WCStrTy : ArgTypeResult::CStrTy);
-    case ConversionSpecifier::UnicodeStrArg:
+    case ConversionSpecifier::SArg:
       // FIXME: This appears to be Mac OS X specific.
       return ArgTypeResult::WCStrTy;
     case ConversionSpecifier::CArg: