diff options
| author | Ted Kremenek <kremenek@apple.com> | 2010-07-20 20:03:58 +0000 |
|---|---|---|
| committer | Ted Kremenek <kremenek@apple.com> | 2010-07-20 20:03:58 +0000 |
| commit | 99196b1031d37d37f395a3291ccdd12a3fc01242 (patch) | |
| tree | cf0dadb5e73b45e306697d289ed7750b5f58a152 /lib/Analysis/PrintfFormatString.cpp | |
| parent | 92a6febe130dd9ad726983835297e11b2fa3b93f (diff) | |
Rename 'CStrArg' to 'sArg' for printf checking to match with the analagous enum for scanf checking.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@108898 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Analysis/PrintfFormatString.cpp')
| -rw-r--r-- | lib/Analysis/PrintfFormatString.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/Analysis/PrintfFormatString.cpp b/lib/Analysis/PrintfFormatString.cpp index 9606a69e5e..08a4c277df 100644 --- a/lib/Analysis/PrintfFormatString.cpp +++ b/lib/Analysis/PrintfFormatString.cpp @@ -181,7 +181,7 @@ static PrintfSpecifierResult ParsePrintfSpecifier(FormatStringHandler &H, 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 @@ const char *ConversionSpecifier::toString() const { 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 @@ ArgTypeResult PrintfSpecifier::getArgType(ASTContext &Ctx) const { } 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 @@ ArgTypeResult PrintfSpecifier::getArgType(ASTContext &Ctx) const { 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 @@ bool PrintfSpecifier::hasValidLengthModifier() const { case ConversionSpecifier::GArg: case ConversionSpecifier::OutIntPtrArg: case ConversionSpecifier::cArg: - case ConversionSpecifier::CStrArg: + case ConversionSpecifier::sArg: return true; default: return false; @@ -646,7 +646,7 @@ bool PrintfSpecifier::hasValidPrecision() const { case ConversionSpecifier::FArg: case ConversionSpecifier::gArg: case ConversionSpecifier::GArg: - case ConversionSpecifier::CStrArg: + case ConversionSpecifier::sArg: return true; default: |