[cfe-commits] r70364 - in /cfe/trunk/include/clang/Basic: DiagnosticGroups.td DiagnosticSemaKinds.td

[Chris Lattner]

Author: lattner
Date: Tue Apr 28 23:31:58 2009
New Revision: 70364

URL: http://llvm.org/viewvc/llvm-project?rev=70364&view=rev
Log:
Wire up -Wformat=2 and -Wformat-extra-args

Modified:
    cfe/trunk/include/clang/Basic/DiagnosticGroups.td
    cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td

Modified: cfe/trunk/include/clang/Basic/DiagnosticGroups.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticGroups.td?rev=70364&r1=70363&r2=70364&view=diff

==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticGroups.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticGroups.td Tue Apr 28 23:31:58 2009
@@ -35,14 +35,13 @@
 def FormatExtraArgs : DiagGroup<"format-extra-args">;
 
 def Format : DiagGroup<"format", [FormatExtraArgs]>;
-def Format2 : DiagGroup<"format=2", [Format]>;
 def FormatNonLiteral : DiagGroup<"format-nonliteral", [Format]>;
 def FormatSecurity : DiagGroup<"format-security", [Format]>;
-def : DiagGroup<"format-y2k", [Format]>;
+def FormatY2K : DiagGroup<"format-y2k", [Format]>;
+def Format2 : DiagGroup<"format=2",
+                        [FormatNonLiteral, FormatSecurity, FormatY2K]>;
 
 def FourByteMultiChar : DiagGroup<"four-char-constants">;
-
-
 def : DiagGroup<"init-self">;
 def : DiagGroup<"inline">;
 def : DiagGroup<"int-to-pointer-cast">;

Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=70364&r1=70363&r2=70364&view=diff

==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Tue Apr 28 23:31:58 2009
@@ -1509,7 +1509,7 @@
 def warn_printf_insufficient_data_args : Warning<
   "more '%%' conversions than data arguments">;
 def warn_printf_too_many_data_args : Warning<
-  "more data arguments than '%%' conversions">;
+  "more data arguments than '%%' conversions">, InGroup<FormatExtraArgs>;
 def warn_printf_invalid_conversion : Warning<"invalid conversion '%0'">;
 def warn_printf_missing_format_string : Warning<"format string missing">;
 def warn_printf_empty_format_string : Warning<"format string is empty">;