From a312e8fe6d89f5eae6a4583d5db577121e61c0b5 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Mon, 4 Oct 2021 19:10:43 +0000 Subject: Fix stdio-common tests for GCC 12 -Waddress My glibc bot shows failures building the testsuite with GCC mainline across all architectures: tst-vfprintf-width-prec.c: In function 'do_test': tst-vfprintf-width-prec.c:90:16: error: the comparison will always evaluate as 'false' for the address of 'result' will never be NULL [-Werror=address] 90 | if (result == NULL) | ^~ tst-vfprintf-width-prec.c:89:13: note: 'result' declared here 89 | wchar_t result[100]; | ^~~~~~ This is clearly a correct warning; the comparison against NULL is clearly a cut-and-paste mistake from an earlier case in the test that does use calloc. Thus, remove the unnecessary check for NULL shown up by the warning. Similarly, two other tests have bogus comparisons against NULL; remove those as well: scanf14a.c:95:13: error: the comparison will always evaluate as 'false' for the address of 'fname' will never be NULL [-Werror=address] 95 | if (fname == NULL) | ^~ scanf14a.c:93:8: note: 'fname' declared here 93 | char fname[strlen (tmpdir) + sizeof "/tst-scanf14.XXXXXX"]; | ^~~~~ scanf16a.c:125:13: error: the comparison will always evaluate as 'false' for the address of 'fname' will never be NULL [-Werror=address] 125 | if (fname == NULL) | ^~ scanf16a.c:123:8: note: 'fname' declared here 123 | char fname[strlen (tmpdir) + sizeof "/tst-scanf16.XXXXXX"]; | ^~~~~ Tested with build-many-glibcs.py (GCC mainline) for aarch64-linux-gnu. --- stdio-common/scanf14a.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'stdio-common/scanf14a.c') diff --git a/stdio-common/scanf14a.c b/stdio-common/scanf14a.c index 12adcff5a4..b37712d1c6 100644 --- a/stdio-common/scanf14a.c +++ b/stdio-common/scanf14a.c @@ -92,8 +92,6 @@ main (void) char fname[strlen (tmpdir) + sizeof "/tst-scanf14.XXXXXX"]; sprintf (fname, "%s/tst-scanf14.XXXXXX", tmpdir); - if (fname == NULL) - FAIL (); /* Create a temporary file. */ int fd = mkstemp (fname); -- cgit 1.4.1