diff options
| -rw-r--r-- | include/clang/Analysis/Analyses/FormatString.h | 2 | ||||
| -rw-r--r-- | lib/Analysis/PrintfFormatString.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/clang/Analysis/Analyses/FormatString.h b/include/clang/Analysis/Analyses/FormatString.h index d76e4f7ad0..a64e4a56e6 100644 --- a/include/clang/Analysis/Analyses/FormatString.h +++ b/include/clang/Analysis/Analyses/FormatString.h @@ -259,7 +259,7 @@ public: InvalidSpecifier = 0, // C99 conversion specifiers. dArg, // 'd' - IntAsCharArg, // 'c' + cArg, // 'c' iArg, // 'i', oArg, // 'o', uArg, // 'u', diff --git a/lib/Analysis/PrintfFormatString.cpp b/lib/Analysis/PrintfFormatString.cpp index 584fc12002..9606a69e5e 100644 --- a/lib/Analysis/PrintfFormatString.cpp +++ b/lib/Analysis/PrintfFormatString.cpp @@ -172,7 +172,7 @@ static PrintfSpecifierResult ParsePrintfSpecifier(FormatStringHandler &H, case 'G': k = ConversionSpecifier::GArg; break; case 'X': k = ConversionSpecifier::XArg; break; case 'a': k = ConversionSpecifier::aArg; break; - case 'c': k = ConversionSpecifier::IntAsCharArg; break; + case 'c': k = ConversionSpecifier::cArg; break; case 'd': k = ConversionSpecifier::dArg; break; case 'e': k = ConversionSpecifier::eArg; break; case 'f': k = ConversionSpecifier::fArg; break; @@ -249,7 +249,7 @@ const char *ConversionSpecifier::toString() const { case GArg: return "G"; case aArg: return "a"; case AArg: return "A"; - case IntAsCharArg: return "c"; + case cArg: return "c"; case CStrArg: return "s"; case VoidPtrArg: return "p"; case OutIntPtrArg: return "n"; @@ -388,7 +388,7 @@ bool PrintfSpecifier::fixType(QualType QT) { // Set conversion specifier and disable any flags which do not apply to it. if (QT->isAnyCharacterType()) { - CS.setKind(ConversionSpecifier::IntAsCharArg); + CS.setKind(ConversionSpecifier::cArg); Precision.setHowSpecified(OptionalAmount::NotSpecified); HasAlternativeForm = 0; HasLeadingZeroes = 0; @@ -601,7 +601,7 @@ bool PrintfSpecifier::hasValidLengthModifier() const { case ConversionSpecifier::gArg: case ConversionSpecifier::GArg: case ConversionSpecifier::OutIntPtrArg: - case ConversionSpecifier::IntAsCharArg: + case ConversionSpecifier::cArg: case ConversionSpecifier::CStrArg: return true; default: |