From: H.J. Lu <hjl.tools@gmail.com>
Date: Fri, 19 Dec 2014 22:01:40 +0000 (-0800)
Subject: Replace %ld with %jd and cast to intmax_t
X-Git-Tag: glibc-2.21~139
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad86fbc3d5e4bab709d162f40e5d1a19ab8f3f6b;p=thirdparty%2Fglibc.git

Replace %ld with %jd and cast to intmax_t
---

diff --git a/ChangeLog b/ChangeLog
index 7def2b67a15..b3d16afc5bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,8 @@
 	* rt/tst-timer4.c: Include <stdint.h>.
 	(check_ts): Replace %ld with %jd and cast to intmax_t.
 	(do_test): Likewise.
+	* stdio-common/tst-fmemopen2.c (do_test): Replace %ld with %jd
+	and cast to intmax_t.
 
 2014-12-30  Andrew Senkevich  <andrew.senkevich@intel.com>
 	    H.J. Lu  <hongjiu.lu@intel.com>
diff --git a/stdio-common/tst-fmemopen2.c b/stdio-common/tst-fmemopen2.c
index c2a4baace9c..e9d8b634feb 100644
--- a/stdio-common/tst-fmemopen2.c
+++ b/stdio-common/tst-fmemopen2.c
@@ -21,14 +21,15 @@ do_test (void)
   off_t o = ftello (fp);
   if (o != nstr)
     {
-      printf ("first ftello returned %ld, expected %zu\n", o, nstr);
+      printf ("first ftello returned %jd, expected %zu\n",
+	      (intmax_t) o, nstr);
       result = 1;
     }
   rewind (fp);
   o = ftello (fp);
   if (o != 0)
     {
-      printf ("second ftello returned %ld, expected 0\n", o);
+      printf ("second ftello returned %jd, expected 0\n", (intmax_t) o);
       result = 1;
     }
   if (fseeko (fp, 0, SEEK_END) != 0)
@@ -39,7 +40,8 @@ do_test (void)
   o = ftello (fp);
   if (o != nstr)
     {
-      printf ("third ftello returned %ld, expected %zu\n", o, nstr);
+      printf ("third ftello returned %jd, expected %zu\n",
+	      (intmax_t) o, nstr);
       result = 1;
     }
   rewind (fp);
@@ -50,7 +52,8 @@ do_test (void)
   o = ftello (fp);
   if (o != nstr2)
     {
-      printf ("fourth ftello returned %ld, expected %zu\n", o, nstr2);
+      printf ("fourth ftello returned %jd, expected %zu\n",
+	      (intmax_t) o, nstr2);
       result = 1;
     }
   fclose (fp);