lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-01 10:06:57 +03:00
Code Activity

Silence some false positive warnings for gcc 4.7

Browse Source
This commit is contained in:
Chris Metcalf
2016-01-20 17:07:51 -05:00
parent a3140836c8
commit 2a9feb9277
3 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2016-01-20 Chris Metcalf <cmetcalf@ezchip.com>
* nis/nis_table.c (__follow_path): Disable diagnostic for
uninitialized variable that is a false positive for gcc 4.7.
* stdio-common/vfscanf.c (_IO_vfwscanf): Likewise.
2016-01-20 Roland McGrath <roland@hack.frob.com> 2016-01-20 Roland McGrath <roland@hack.frob.com>
* sysdeps/nacl/lowlevellock-futex.h * sysdeps/nacl/lowlevellock-futex.h

9
nis/nis_table.c
View File

@ -19,6 +19,7 @@
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include <rpcsvc/nis.h> #include <rpcsvc/nis.h>
#include <libc-internal.h>
#include "nis_xdr.h" #include "nis_xdr.h"
#include "nis_intern.h" #include "nis_intern.h"
@ -175,6 +176,12 @@ __follow_path (char **tablepath, char **tableptr, struct ib_request *ibreq,
*tableptr = *tablepath; *tableptr = *tablepath;
} }
/* Since tableptr is only set here, and it's set when tablepath is NULL,
which it is initially defined as, we know it will always be set here. */
DIAG_PUSH_NEEDS_COMMENT;
DIAG_IGNORE_NEEDS_COMMENT (4.7, "-Wmaybe-uninitialized");
if (*tableptr == NULL) if (*tableptr == NULL)
return NIS_NOTFOUND; return NIS_NOTFOUND;
@ -182,6 +189,8 @@ __follow_path (char **tablepath, char **tableptr, struct ib_request *ibreq,
if (newname[0] == '\0') if (newname[0] == '\0')
return NIS_NOTFOUND; return NIS_NOTFOUND;
DIAG_POP_NEEDS_COMMENT;
newname = strdup (newname); newname = strdup (newname);
if (newname == NULL) if (newname == NULL)
return NIS_NOMEMORY; return NIS_NOMEMORY;

10
stdio-common/vfscanf.c
View File

@ -27,6 +27,7 @@
#include <string.h> #include <string.h>
#include <wchar.h> #include <wchar.h>
#include <wctype.h> #include <wctype.h>
#include <libc-internal.h>
#include <libc-lock.h> #include <libc-lock.h>
#include <locale/localeinfo.h> #include <locale/localeinfo.h>
#include <scratch_buffer.h> #include <scratch_buffer.h>
@ -1535,6 +1536,13 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
{ {
/* Get the string for the digits with value N. */ /* Get the string for the digits with value N. */
#ifdef COMPILE_WSCANF #ifdef COMPILE_WSCANF
/* wcdigits_extended[] is fully set in the loop
above, but the test for "map != NULL" is done
inside the loop here and outside the loop there. */
DIAG_PUSH_NEEDS_COMMENT;
DIAG_IGNORE_NEEDS_COMMENT (4.7, "-Wmaybe-uninitialized");
if (__glibc_unlikely (map != NULL)) if (__glibc_unlikely (map != NULL))
wcdigits[n] = wcdigits_extended[n]; wcdigits[n] = wcdigits_extended[n];
else else
@ -1542,6 +1550,8 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
_NL_CURRENT (LC_CTYPE, _NL_CTYPE_INDIGITS0_WC + n); _NL_CURRENT (LC_CTYPE, _NL_CTYPE_INDIGITS0_WC + n);
wcdigits[n] += from_level; wcdigits[n] += from_level;
DIAG_POP_NEEDS_COMMENT;
if (c == (wint_t) *wcdigits[n]) if (c == (wint_t) *wcdigits[n])
{ {
to_level = from_level; to_level = from_level;