diff options
| -rw-r--r-- | include/clang/Analysis/Analyses/FormatString.h | 8 | ||||
| -rw-r--r-- | lib/Analysis/PrintfFormatString.cpp | 12 | ||||
| -rw-r--r-- | lib/Analysis/ScanfFormatString.cpp | 2 | ||||
| -rw-r--r-- | lib/Sema/SemaChecking.cpp | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/include/clang/Analysis/Analyses/FormatString.h b/include/clang/Analysis/Analyses/FormatString.h index 2d13c59c47..2e1060572c 100644 --- a/include/clang/Analysis/Analyses/FormatString.h +++ b/include/clang/Analysis/Analyses/FormatString.h @@ -273,9 +273,9 @@ public: GArg, // 'G', aArg, // 'a', AArg, // 'A', - sArg, // 's' - pArg, // 'p' - OutIntPtrArg, // 'n' + sArg, // 's' + pArg, // 'p' + nArg, // 'n' PercentArg, // '%' // MacOS X unicode extensions. CArg, // 'C' @@ -465,7 +465,7 @@ public: sArg, // 's', // match sequence of non-write-space characters pArg, // 'p' cArg, // 'c', differs from printf, writes array of characters - ConsumedSoFarArg, // 'n', differs from printf, writes back args consumed + nArg, // 'n', differs from printf, writes back args consumed PercentArg, // '%' ScanListArg, // '[' followed by scan list // IEEE Std 1003.1 extensions. diff --git a/lib/Analysis/PrintfFormatString.cpp b/lib/Analysis/PrintfFormatString.cpp index c49fcd3e6b..dc980b3162 100644 --- a/lib/Analysis/PrintfFormatString.cpp +++ b/lib/Analysis/PrintfFormatString.cpp @@ -178,7 +178,7 @@ static PrintfSpecifierResult ParsePrintfSpecifier(FormatStringHandler &H, case 'f': k = ConversionSpecifier::fArg; break; case 'g': k = ConversionSpecifier::gArg; break; case 'i': k = ConversionSpecifier::iArg; break; - case 'n': k = ConversionSpecifier::OutIntPtrArg; break; + case 'n': k = ConversionSpecifier::nArg; break; case 'o': k = ConversionSpecifier::oArg; break; case 'p': k = ConversionSpecifier::pArg; break; case 's': k = ConversionSpecifier::sArg; break; @@ -252,7 +252,7 @@ const char *ConversionSpecifier::toString() const { case cArg: return "c"; case sArg: return "s"; case pArg: return "p"; - case OutIntPtrArg: return "n"; + case nArg: return "n"; case PercentArg: return "%"; case InvalidSpecifier: return NULL; @@ -550,7 +550,7 @@ bool PrintfSpecifier::hasValidLeftJustified() const { // The left justified flag is valid for all conversions except n switch (CS.getKind()) { - case ConversionSpecifier::OutIntPtrArg: + case ConversionSpecifier::nArg: return false; default: @@ -577,7 +577,7 @@ bool PrintfSpecifier::hasValidLengthModifier() const { case ConversionSpecifier::uArg: case ConversionSpecifier::xArg: case ConversionSpecifier::XArg: - case ConversionSpecifier::OutIntPtrArg: + case ConversionSpecifier::nArg: return true; default: return false; @@ -600,7 +600,7 @@ bool PrintfSpecifier::hasValidLengthModifier() const { case ConversionSpecifier::EArg: case ConversionSpecifier::gArg: case ConversionSpecifier::GArg: - case ConversionSpecifier::OutIntPtrArg: + case ConversionSpecifier::nArg: case ConversionSpecifier::cArg: case ConversionSpecifier::sArg: return true; @@ -659,7 +659,7 @@ bool PrintfSpecifier::hasValidFieldWidth() const { // The field width is valid for all conversions except n switch (CS.getKind()) { - case ConversionSpecifier::OutIntPtrArg: + case ConversionSpecifier::nArg: return false; default: diff --git a/lib/Analysis/ScanfFormatString.cpp b/lib/Analysis/ScanfFormatString.cpp index 0ea0754313..fc2e77c0a9 100644 --- a/lib/Analysis/ScanfFormatString.cpp +++ b/lib/Analysis/ScanfFormatString.cpp @@ -158,7 +158,7 @@ static ScanfSpecifierResult ParseScanfSpecifier(FormatStringHandler &H, case 'f': k = ConversionSpecifier::fArg; break; case 'g': k = ConversionSpecifier::gArg; break; case 'i': k = ConversionSpecifier::iArg; break; - case 'n': k = ConversionSpecifier::ConsumedSoFarArg; break; + case 'n': k = ConversionSpecifier::nArg; break; case 'c': k = ConversionSpecifier::cArg; break; case 'C': k = ConversionSpecifier::CArg; break; case 'S': k = ConversionSpecifier::SArg; break; diff --git a/lib/Sema/SemaChecking.cpp b/lib/Sema/SemaChecking.cpp index 811a9d8724..6d71b103ba 100644 --- a/lib/Sema/SemaChecking.cpp +++ b/lib/Sema/SemaChecking.cpp @@ -1525,7 +1525,7 @@ CheckPrintfHandler::HandlePrintfSpecifier(const analyze_printf::PrintfSpecifier LM.getLength())); // Are we using '%n'? - if (CS.getKind() == ConversionSpecifier::OutIntPtrArg) { + if (CS.getKind() == ConversionSpecifier::nArg) { // Issue a warning about this being a possible security issue. S.Diag(getLocationOfByte(CS.getStart()), diag::warn_printf_write_back) << getSpecifierRange(startSpecifier, specifierLen); |