From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 114739 invoked by alias); 11 Jul 2015 20:46:36 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 114727 invoked by uid 89); 11 Jul 2015 20:46:35 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.4 required=5.0 tests=AWL,BAYES_50,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-pd0-f171.google.com X-Received: by 10.70.131.232 with SMTP id op8mr53881214pdb.156.1436647592788; Sat, 11 Jul 2015 13:46:32 -0700 (PDT) Date: Sat, 11 Jul 2015 20:46:00 -0000 From: "H.J. Lu" To: GNU C Library Subject: [committed, PATCH] Replace %ld with %jd and cast to intmax_t Message-ID: <20150711204630.GA20185@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit User-Agent: Mutt/1.5.23 (2014-03-12) X-SW-Source: 2015-07/txt/msg00366.txt.bz2 On x32, GCC 5.1 complains: tst-fmemopen2.c: In function ‘do_test_without_buffer’: tst-fmemopen2.c:124:15: error: format ‘%ld’ expects argument of type ‘long int’, but argument 2 has type ‘off_t {aka long long int}’ [-Werror=format=] printf ("FAIL: first ftello returned %ld, expected %zu\n", o, nstr); ^ tst-fmemopen2.c:135:15: error: format ‘%ld’ expects argument of type ‘long int’, but argument 2 has type ‘off_t {aka long long int}’ [-Werror=format=] printf ("FAIL: second ftello returned %ld, expected %zu\n", o, nbuf); ^ tst-fmemopen2.c:148:15: error: format ‘%ld’ expects argument of type ‘long int’, but argument 2 has type ‘off_t {aka long long int}’ [-Werror=format=] printf ("FAIL: third ftello returned %ld, expected %zu\n", o, nstr2); ^ tst-fmemopen2.c: In function ‘do_test_length_zero’: tst-fmemopen2.c:183:15: error: format ‘%ld’ expects argument of type ‘long int’, but argument 2 has type ‘off_t {aka long long int}’ [-Werror=format=] printf ("FAIL: first ftello returned %ld, expected 0\n", o); ^ This patch silences GCC. * stdio-common/tst-fmemopen2.c (do_test_without_buffer): Replace %ld with %jd and cast to intmax_t. (do_test_length_zero): Likewise. --- ChangeLog | 6 ++++++ stdio-common/tst-fmemopen2.c | 12 ++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b6e7a79..84f038c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-07-11 H.J. Lu + + * stdio-common/tst-fmemopen2.c (do_test_without_buffer): Replace + %ld with %jd and cast to intmax_t. + (do_test_length_zero): Likewise. + 2015-07-10 Roland McGrath * sysdeps/nacl/pthread_condattr_setclock.c: New file. diff --git a/stdio-common/tst-fmemopen2.c b/stdio-common/tst-fmemopen2.c index 2f26f20..16dd3ad 100644 --- a/stdio-common/tst-fmemopen2.c +++ b/stdio-common/tst-fmemopen2.c @@ -121,7 +121,8 @@ do_test_without_buffer (void) off_t o = ftello (fp); if (o != nstr) { - printf ("FAIL: first ftello returned %ld, expected %zu\n", o, nstr); + printf ("FAIL: first ftello returned %jd, expected %zu\n", + (intmax_t) o, nstr); result = 1; } if (fseeko (fp, 0, SEEK_END) != 0) @@ -132,7 +133,8 @@ do_test_without_buffer (void) o = ftello (fp); if (o != nstr) { - printf ("FAIL: second ftello returned %ld, expected %zu\n", o, nbuf); + printf ("FAIL: second ftello returned %jd, expected %zu\n", + (intmax_t) o, nbuf); result = 1; } @@ -145,7 +147,8 @@ do_test_without_buffer (void) o = ftello (fp); if (o != nstr2) { - printf ("FAIL: third ftello returned %ld, expected %zu\n", o, nstr2); + printf ("FAIL: third ftello returned %jd, expected %zu\n", + (intmax_t) o, nstr2); result = 1; } fclose (fp); @@ -180,7 +183,8 @@ do_test_length_zero (void) off_t o = ftello (fp); if (o != 0) { - printf ("FAIL: first ftello returned %ld, expected 0\n", o); + printf ("FAIL: first ftello returned %jd, expected 0\n", + (intmax_t) o); result = 1; } fclose (fp); -- 2.4.3