about summary refs log tree commit diff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2014-12-19 14:05:35 -0800
committerH.J. Lu <hjl.tools@gmail.com>2014-12-30 08:10:19 -0800
commit126f6c7288b7262fd84a2026a33f36f0cc495871 (patch)
tree05a78521f6681ad7a41e1672bdc7531406c3b04f
parentfe342f50136919f1945d9a03964ee614c97d8659 (diff)
downloadglibc-126f6c7288b7262fd84a2026a33f36f0cc495871.tar.gz
glibc-126f6c7288b7262fd84a2026a33f36f0cc495871.tar.xz
glibc-126f6c7288b7262fd84a2026a33f36f0cc495871.zip
Replace %ld with %jd and cast to intmax_t
-rw-r--r--ChangeLog1
-rw-r--r--timezone/tst-timezone.c8
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index a228b9e623..ce76c8d819 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,7 @@
 	* sysdeps/pthread/tst-timer.c (main): Likewise.
 	* time/clocktest.c (main): Likewise.
 	* time/tst-posixtz.c (do_test): Likewise.
+	* timezone/tst-timezone.c (main): Likewise.
 
 2014-12-30  Andrew Senkevich  <andrew.senkevich@intel.com>
 	    H.J. Lu  <hongjiu.lu@intel.com>
diff --git a/timezone/tst-timezone.c b/timezone/tst-timezone.c
index b5edfff5f8..135a72fc9a 100644
--- a/timezone/tst-timezone.c
+++ b/timezone/tst-timezone.c
@@ -126,8 +126,8 @@ main (int argc, char ** argv)
     strcpy (envstring, "TZ=Europe/London");
     putenv (envstring);
     t = mktime (&tmBuf);
-    snprintf (buf, sizeof (buf), "TZ=%s %ld %d %d %d %d %d %d %d %d %d",
-	      getenv ("TZ"), t,
+    snprintf (buf, sizeof (buf), "TZ=%s %jd %d %d %d %d %d %d %d %d %d",
+	      getenv ("TZ"), (intmax_t) t,
 	      tmBuf.tm_sec, tmBuf.tm_min, tmBuf.tm_hour,
 	      tmBuf.tm_mday, tmBuf.tm_mon, tmBuf.tm_year,
 	      tmBuf.tm_wday, tmBuf.tm_yday, tmBuf.tm_isdst);
@@ -149,8 +149,8 @@ main (int argc, char ** argv)
     strcpy (envstring, "TZ=GMT");
     /* No putenv call needed!  */
     t = mktime (&tmBuf);
-    snprintf (buf, sizeof (buf), "TZ=%s %ld %d %d %d %d %d %d %d %d %d",
-	      getenv ("TZ"), t,
+    snprintf (buf, sizeof (buf), "TZ=%s %jd %d %d %d %d %d %d %d %d %d",
+	      getenv ("TZ"), (intmax_t) t,
 	      tmBuf.tm_sec, tmBuf.tm_min, tmBuf.tm_hour,
 	      tmBuf.tm_mday, tmBuf.tm_mon, tmBuf.tm_year,
 	      tmBuf.tm_wday, tmBuf.tm_yday, tmBuf.tm_isdst);