diff options
| author | Chris Lattner <sabre@nondot.org> | 2009-04-29 04:31:58 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2009-04-29 04:31:58 +0000 |
| commit | fd4a4d1f8a275d720389d2f242cc483ee40b4f03 (patch) | |
| tree | 082eb67e3723b056bea9c8b58583117575c9b3a2 | |
| parent | 83a3235a3ea7922490318c271e5caf9a3d098764 (diff) | |
| download | bcm5719-llvm-fd4a4d1f8a275d720389d2f242cc483ee40b4f03.tar.gz bcm5719-llvm-fd4a4d1f8a275d720389d2f242cc483ee40b4f03.zip | |
Wire up -Wformat=2 and -Wformat-extra-args
llvm-svn: 70364
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticGroups.td | 7 | ||||
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticSemaKinds.td | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/clang/include/clang/Basic/DiagnosticGroups.td b/clang/include/clang/Basic/DiagnosticGroups.td index 69651f41a41..e0d33e2d245 100644 --- a/clang/include/clang/Basic/DiagnosticGroups.td +++ b/clang/include/clang/Basic/DiagnosticGroups.td @@ -35,14 +35,13 @@ def ExtraTokens : DiagGroup<"extra-tokens">; 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">; diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index 88607f3a3ba..30e9b389a61 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -1509,7 +1509,7 @@ def warn_printf_write_back : Warning< 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">; |
