2017-01-11 Joseph Myers <joseph@codesourcery.com>
+ * stdio-common/tst-printf.c [__GNUC_PREREQ (7, 0)]: Ignore
+ -Wformat-truncation instead of -Wformat-length.
+ * time/tst-strptime2.c (mkbuf) [__GNUC_PREREQ (7, 0)]: Likewise.
+ * stdio-common/tstdiomisc.c (F): Ignore -Wformat-truncation for
+ GCC 7.
+ * wcsmbs/tst-wcstof.c: Include <libc-internal.h>.
+ (do_test): Ignore -Wformat-truncation for GCC 7.
+
* locale/programs/ld-address.c (INT_STR_ELEM): Increase size of
buffer used to print long int value.
DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wformat");
#if __GNUC_PREREQ (7, 0)
-/* Compiler warnings about format lengths should also be ignored. */
-DIAG_IGNORE_NEEDS_COMMENT (7.0, "-Wformat-length");
+/* Compiler warnings about snprintf output truncation should also be
+ ignored. */
+DIAG_IGNORE_NEEDS_COMMENT (7.0, "-Wformat-truncation");
#endif
static void rfg1 (void);
qnanval = NAN;
+ /* The %f and %F arguments are in fact constants, but GCC is
+ prevented from seeing this (volatile is used) so it cannot tell
+ that the output is not truncated. */
+ DIAG_PUSH_NEEDS_COMMENT;
+#if __GNUC_PREREQ (7, 0)
+ DIAG_IGNORE_NEEDS_COMMENT (7.0, "-Wformat-truncation");
+#endif
+
snprintf (buf, sizeof buf, "%a %A %e %E %f %F %g %G",
qnanval, qnanval, qnanval, qnanval,
qnanval, qnanval, qnanval, qnanval);
printf ("expected L\"-inf -INF -inf -INF -inf -INF -inf -INF\", got L\"%S\"\n",
wbuf);
+ DIAG_POP_NEEDS_COMMENT;
+
return result;
}
This test is explicitly using short buffers to force snprintf to truncate
the output so we ignore the warnings. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (7.0, "-Wformat-length");
+ DIAG_IGNORE_NEEDS_COMMENT (7.0, "-Wformat-truncation");
#endif
if (colon)
snprintf (buf + i, ndigits + 2, "%02u:%02u", hh, mm);
#include <stdio.h>
#include <string.h>
#include <wctype.h>
+#include <libc-internal.h>
static int
do_test (void)
tmp[1] = '1';
tmp[2] = 0;
+ /* GCC does not know the result of wcstof so cannot see that the
+ snprintf output is not truncated. */
+ DIAG_PUSH_NEEDS_COMMENT;
+#if __GNUC_PREREQ (7, 0)
+ DIAG_IGNORE_NEEDS_COMMENT (7.0, "-Wformat-truncation");
+#endif
snprintf (buf, 100, "%S = %f", tmp, wcstof (tmp, NULL));
+ DIAG_POP_NEEDS_COMMENT;
printf ("\"%s\" -> %s\n", buf,
strcmp (buf, "81 = 81.000000") == 0 ? "okay" : "buggy");
result |= strcmp (buf, "81 = 81.000000") != 0;