This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.20-340-g73b0c1a
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 11 Dec 2014 21:56:01 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.20-340-g73b0c1a
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 73b0c1a19c679745897b9fa2efef0c00469efa92 (commit)
from 1c4053db63e2a3470ed8ace2ddd9636f9a6e135c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=73b0c1a19c679745897b9fa2efef0c00469efa92
commit 73b0c1a19c679745897b9fa2efef0c00469efa92
Author: Roland McGrath <roland@hack.frob.com>
Date: Thu Dec 11 13:52:57 2014 -0800
Suppress -Wformat-security in tst-error1.c.
diff --git a/ChangeLog b/ChangeLog
index ad8fe21..35d61bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2014-12-11 Roland McGrath <roland@hack.frob.com>
+ * misc/tst-error1.c (do_test): Ignore -Wformat-security for
+ generated error format strings.
+
* stdio-common/tstdiomisc.c (t2): Ignore -Wformat and
-Wformat-extra-args warnings for scanf formats.
* stdio-common/scanf4.c (main): Ignore -Wformat-zero-length around
diff --git a/misc/tst-error1.c b/misc/tst-error1.c
index e84843e..a97a22c 100644
--- a/misc/tst-error1.c
+++ b/misc/tst-error1.c
@@ -3,6 +3,7 @@
#include <stdio.h>
#include <string.h>
#include <wchar.h>
+#include <libc-internal.h>
static int
do_test (int argc, char *argv[])
@@ -16,8 +17,18 @@ do_test (int argc, char *argv[])
for (int i = 0; i < 1000; ++i)
memcpy (&buf[i * (sizeof (str) - 1)], str, sizeof (str));
error (0, 0, str);
+
+ /* We're testing a large format string here and need to generate it
+ to avoid this source file being ridiculous. So disable the warning
+ about a generated format string. */
+ DIAG_PUSH_NEEDS_COMMENT;
+ DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wformat-security");
+
error (0, 0, buf);
error (0, 0, buf);
+
+ DIAG_POP_NEEDS_COMMENT;
+
error (0, 0, str);
return 0;
}
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 3 +++
misc/tst-error1.c | 11 +++++++++++
2 files changed, 14 insertions(+), 0 deletions(-)
hooks/post-receive
--
GNU C Library master sources