From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id A1CF13857007; Thu, 12 Jan 2023 06:21:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A1CF13857007 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673504491; bh=6jftNxAR9LarHYZoj20JubBgfPVSw/N6PeAUhMDlgZ0=; h=From:To:Subject:Date:From; b=NZsXXGKJkU7RiCbt/ywKZ9r2YP6EYcES3yB0K/VmfE0XHJBFVjUOgbPJntVQH5MnW Vni9k7Wqs8Ud2aSu9QMmC0/1i4RUT3twi4AfeNc+ONfRrGIjH0K8oH9qGs1CwlOTeo PS924e64HZZ9krBfNY3C+yTeDcI2mJlQ+wRTyF90= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc/release/2.34/master] Fix stdio-common tests for GCC 12 -Waddress X-Act-Checkin: glibc X-Git-Author: Joseph Myers X-Git-Refname: refs/heads/release/2.34/master X-Git-Oldrev: 26c7c6bac9da305b634a661aa491dae2756581ec X-Git-Newrev: 6ff61a51459d141782fbcc32ae81c0ef1954dad6 Message-Id: <20230112062131.A1CF13857007@sourceware.org> Date: Thu, 12 Jan 2023 06:21:31 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=6ff61a51459d141782fbcc32ae81c0ef1954dad6 commit 6ff61a51459d141782fbcc32ae81c0ef1954dad6 Author: Joseph Myers Date: Mon Oct 4 19:10:43 2021 +0000 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. (cherry picked from commit a312e8fe6d89f5eae6a4583d5db577121e61c0b5) Diff: --- stdio-common/scanf14a.c | 2 -- stdio-common/scanf16a.c | 2 -- stdio-common/tst-vfprintf-width-prec.c | 6 ------ 3 files changed, 10 deletions(-) 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); diff --git a/stdio-common/scanf16a.c b/stdio-common/scanf16a.c index 400d85a54e..74d0295c97 100644 --- a/stdio-common/scanf16a.c +++ b/stdio-common/scanf16a.c @@ -122,8 +122,6 @@ main (void) char fname[strlen (tmpdir) + sizeof "/tst-scanf16.XXXXXX"]; sprintf (fname, "%s/tst-scanf16.XXXXXX", tmpdir); - if (fname == NULL) - FAIL (); /* Create a temporary file. */ int fd = mkstemp (fname); diff --git a/stdio-common/tst-vfprintf-width-prec.c b/stdio-common/tst-vfprintf-width-prec.c index 3192fd797a..278d57f739 100644 --- a/stdio-common/tst-vfprintf-width-prec.c +++ b/stdio-common/tst-vfprintf-width-prec.c @@ -87,12 +87,6 @@ do_test (void) } { wchar_t result[100]; - if (result == NULL) - { - printf ("error: calloc (%d, %zu): %m", ret + 1, sizeof (wchar_t)); - return 1; - } - ret = swprintf (result, 100, L"%133000.999999999x", 17); if (ret >= 0) {