qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix -Wformat-length warning in time/tst-strptime2.c 

* time/tst-strptime2.c: Ignore -Wformat-length warning.
This commit is contained in:
Steve Ellcey 2016-11-02 16:00:39 -07:00
parent 0cb9dcc8f2
commit 26d7185d6f
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2016-11-02 Steve Ellcey <sellcey@caviumnetworks.com>
* time/tst-strptime2.c: Ignore -Wformat-length warning.
2016-11-02 Florian Weimer <fweimer@redhat.com> 2016-11-02 Florian Weimer <fweimer@redhat.com>
Carlos O'Donell <carlos@redhat.com> Carlos O'Donell <carlos@redhat.com>

11
time/tst-strptime2.c
View File

@ -4,6 +4,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#include <time.h> #include <time.h>
#include <libc-internal.h>
/* Dummy string is used to match strptime's %s specifier. */ /* Dummy string is used to match strptime's %s specifier. */
@ -67,10 +68,20 @@ mkbuf (char *buf, bool neg, bool colon, unsigned int hhmm, size_t ndigits)
long int expect = LONG_MAX; long int expect = LONG_MAX;
i = sprintf (buf, "%s %c", dummy_string, sign); i = sprintf (buf, "%s %c", dummy_string, sign);
#if __GNUC_PREREQ (7, 0)
/* GCC issues a warning when it thinks the snprintf buffer may be too short.
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");
#endif
if (colon) if (colon)
snprintf (buf + i, ndigits + 2, "%02u:%02u", hh, mm); snprintf (buf + i, ndigits + 2, "%02u:%02u", hh, mm);
else else
snprintf (buf + i, ndigits + 1, "%04u", hhmm); snprintf (buf + i, ndigits + 1, "%04u", hhmm);
#if __GNUC_PREREQ (7, 0)
DIAG_POP_NEEDS_COMMENT;
#endif
if (mm <= mm_max && (ndigits == 2 || ndigits == 4)) if (mm <= mm_max && (ndigits == 2 || ndigits == 4))
{ {