diff options
| author | Ted Kremenek <kremenek@apple.com> | 2010-07-20 20:04:15 +0000 |
|---|---|---|
| committer | Ted Kremenek <kremenek@apple.com> | 2010-07-20 20:04:15 +0000 |
| commit | de183a48dd8fcff5e0343e84c8a6b563088447ce (patch) | |
| tree | bf2c62081f20e9ca4493e76789953980fe0a8624 | |
| parent | 35d353b47bce29200b910371dd9b8ba7f3058ab8 (diff) | |
Rename 'UnicodeStrArg' to 'SArg'.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@108901 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/clang/Analysis/Analyses/FormatString.h | 2 | ||||
| -rw-r--r-- | lib/Analysis/PrintfFormatString.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/clang/Analysis/Analyses/FormatString.h b/include/clang/Analysis/Analyses/FormatString.h index 2e1060572c..a33db7d8c8 100644 --- 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 dc980b3162..59f865799b 100644 --- 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: |