about summary refs log tree commit diff
path: root/stdio-common
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2015-07-11 13:41:47 -0700
committerH.J. Lu <hjl.tools@gmail.com>2015-07-11 13:45:33 -0700
commit70249b57e1e5f8252948fd0ab46773ad20216e23 (patch)
tree4d2d86597414763e3bd3a507f76f5977e16e887a /stdio-common
parent398a80fec83a41d9f8d16bc3943b9179017a3ee1 (diff)
downloadglibc-70249b57e1e5f8252948fd0ab46773ad20216e23.tar.gz
glibc-70249b57e1e5f8252948fd0ab46773ad20216e23.tar.xz
glibc-70249b57e1e5f8252948fd0ab46773ad20216e23.zip
Replace %ld with %jd and cast to intmax_t
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.
Diffstat (limited to 'stdio-common')
-rw-r--r--stdio-common/tst-fmemopen2.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/stdio-common/tst-fmemopen2.c b/stdio-common/tst-fmemopen2.c
index 2f26f20bc0..16dd3ad73d 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);