AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-23 11:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace %ld with %jd and cast to intmax_t

Browse Source 
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.
This commit is contained in:
H.J. Lu 2015-07-11 13:41:47 -07:00
parent 398a80fec8
commit 70249b57e1
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2015-07-11 H.J. Lu <hongjiu.lu@intel.com>
* 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 <roland@hack.frob.com> 2015-07-10 Roland McGrath <roland@hack.frob.com>
* sysdeps/nacl/pthread_condattr_setclock.c: New file. * sysdeps/nacl/pthread_condattr_setclock.c: New file.

12
stdio-common/tst-fmemopen2.c
View File

@ -121,7 +121,8 @@ do_test_without_buffer (void)
off_t o = ftello (fp); off_t o = ftello (fp);
if (o != nstr) 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; result = 1;
} }
if (fseeko (fp, 0, SEEK_END) != 0) if (fseeko (fp, 0, SEEK_END) != 0)
@ -132,7 +133,8 @@ do_test_without_buffer (void)
o = ftello (fp); o = ftello (fp);
if (o != nstr) 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; result = 1;
} }
@ -145,7 +147,8 @@ do_test_without_buffer (void)
o = ftello (fp); o = ftello (fp);
if (o != nstr2) 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; result = 1;
} }
fclose (fp); fclose (fp);
@ -180,7 +183,8 @@ do_test_length_zero (void)
off_t o = ftello (fp); off_t o = ftello (fp);
if (o != 0) 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; result = 1;
} }
fclose (fp); fclose (fp);