commit 1de1707bfc789e9cf9467c2d37af2a584db6520b
author Ted Kremenek <kremenek@apple.com> Thu Feb 04 20:46:58 2010 +0000
committer Ted Kremenek <kremenek@apple.com> Thu Feb 04 20:46:58 2010 +0000
tree 301f49ba85e0889597c85aa2e4dd3e1f07bd77f5
parent ee9d33b4e7a5c52241749757a7746ada6b31ee5a

Move ParseFormatString() and FormatStringHandler back into the analyze_printf namespace.

llvm-svn: 95324

clang/lib/Sema/SemaChecking.cpp

diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp
index cb0e5fb..cba3c60 100644
--- a/clang/lib/Sema/SemaChecking.cpp
+++ b/clang/lib/Sema/SemaChecking.cpp
@@ -1033,7 +1033,7 @@
 }
 
 namespace {
-class CheckPrintfHandler : public FormatStringHandler {
+class CheckPrintfHandler : public analyze_printf::FormatStringHandler {
   Sema &S;
   const StringLiteral *FExpr;
   const Expr *OrigFormatExpr;
@@ -1061,9 +1061,10 @@
   void HandleIncompleteFormatSpecifier(const char *startSpecifier,
                                        unsigned specifierLen);
   
-  void HandleInvalidConversionSpecifier(const analyze_printf::FormatSpecifier &FS,
-                                        const char *startSpecifier,
-                                        unsigned specifierLen);
+  void
+  HandleInvalidConversionSpecifier(const analyze_printf::FormatSpecifier &FS,
+                                   const char *startSpecifier,
+                                   unsigned specifierLen);
   
   void HandleNullChar(const char *nullCharacter);
   
@@ -1292,9 +1293,9 @@
 
       S.Diag(getLocationOfByte(CS.getStart()),
              diag::warn_printf_conversion_argument_type_mismatch)
-        << *T << Ex->getType()
-        << getFormatSpecifierRange(startSpecifier, specifierLen)
-        << Ex->getSourceRange();
+      << *T << Ex->getType();
+//        << getFormatSpecifierRange(startSpecifier, specifierLen)
+//        << Ex->getSourceRange();
     }
     return true;
   }
@@ -1341,7 +1342,7 @@
                        isa<ObjCStringLiteral>(OrigFormatExpr), Str,
                        HasVAListArg, TheCall, format_idx);
 
-  if (!ParseFormatString(H, Str, Str + StrLen))
+  if (!analyze_printf::ParseFormatString(H, Str, Str + StrLen))
     H.DoneProcessing();
 }