Tweak zero-field width in scanf format string diagnostic.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@108541 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td
index 38c8b6747252f3a9db0c8c80c1b733a1503048b1..9dac3f242212f59d9947bcbb790474d8dbe46f9a 100644 (file)
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/include/clang/Basic/DiagnosticSemaKinds.td
@@ -2941,7 +2941,7 @@ def warn_printf_incomplete_specifier : Warning<
 def warn_missing_format_string : Warning<
   "format string missing">, InGroup<Format>;
 def warn_scanf_nonzero_width : Warning<
-  "conversion specifies 0 input characters for field width">,
+  "zero field width in scanf format string is unused">,
   InGroup<Format>;
 def warn_printf_conversion_argument_type_mismatch : Warning<
   "conversion specifies type %0 but the argument has type %1">,
@@ -2984,6 +2984,9 @@ def warn_printf_nonsensical_length: Warning<
 def warn_printf_ignored_flag: Warning<
   "flag '%0' is ignored when flag '%1' is present">,
   InGroup<Format>;
+def warn_scanf_scanlist_incomplete : Warning<
+  "scanlist not terminated in format string">,
+  InGroup<Format>;
   
 // CHECK: returning address/reference of stack memory
 def warn_ret_stack_addr : Warning<

diff --git a/test/Sema/format-strings-scanf.c b/test/Sema/format-strings-scanf.c
index cd684106937bb9167bc60c94eee52a97aecb4f25..63e81d4c7428fac9a9c49a2b5876b1d884188563 100644 (file)
--- a/test/Sema/format-strings-scanf.c
+++ b/test/Sema/format-strings-scanf.c
@@ -9,6 +9,6 @@ int sscanf(const char * restrict, const char * restrict, ...) ;
 
 void test(const char *s, int *i) {
   scanf(s, i); // expected-warning{{ormat string is not a string literal}}
-  scanf("%0d", i); // expected-warning{{conversion specifies 0 input characters for field width}}
-  scanf("%00d", i); // expected-warning{{conversion specifies 0 input characters for field width}}
+  scanf("%0d", i); // expected-warning{{zero field width in scanf format string is unused}}
+  scanf("%00d", i); // expected-warning{{zero field width in scanf format string is unused}}
 }