This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.20-448-g6318060
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 30 Dec 2014 16:55:35 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.20-448-g6318060
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 63180606eea012b93f0b0cdb6ec37ea8e701d729 (commit)
via 126f6c7288b7262fd84a2026a33f36f0cc495871 (commit)
via fe342f50136919f1945d9a03964ee614c97d8659 (commit)
via 37f469007dd6420bdc0607d0cda63513c42305d9 (commit)
via ad86fbc3d5e4bab709d162f40e5d1a19ab8f3f6b (commit)
via 5d619de4610fa00d0b633e1916c49e59824440ff (commit)
via 6490d945378090db82be2759ff66719a980d9c1c (commit)
via e401d5ca5d10c82f4e35bd9be7098b620ba04746 (commit)
via 41fad83083a21800aafb08fbc888f05ae44d6c8a (commit)
via 8d2b2763fc11da99e0e6b1ea7c0e3d556380e169 (commit)
from 8b4416d83c79ba77b0669203741c712880a09ae4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=63180606eea012b93f0b0cdb6ec37ea8e701d729
commit 63180606eea012b93f0b0cdb6ec37ea8e701d729
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Tue Dec 30 08:12:42 2014 -0800
Mention fix for BZ #17732
diff --git a/NEWS b/NEWS
index 0d481c2..0db6dbf 100644
--- a/NEWS
+++ b/NEWS
@@ -15,7 +15,7 @@ Version 2.21
17522, 17555, 17570, 17571, 17572, 17573, 17574, 17581, 17582, 17583,
17584, 17585, 17589, 17594, 17601, 17608, 17616, 17625, 17630, 17633,
17634, 17647, 17653, 17657, 17664, 17665, 17668, 17682, 17717, 17719,
- 17722, 17724, 17725, 17733, 17744, 17745, 17746, 17747.
+ 17722, 17724, 17725, 17732, 17733, 17744, 17745, 17746, 17747.
* CVE-2104-7817 The wordexp function could ignore the WRDE_NOCMD flag
under certain input conditions resulting in the execution of a shell for
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=126f6c7288b7262fd84a2026a33f36f0cc495871
commit 126f6c7288b7262fd84a2026a33f36f0cc495871
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Dec 19 14:05:35 2014 -0800
Replace %ld with %jd and cast to intmax_t
diff --git a/ChangeLog b/ChangeLog
index a228b9e..ce76c8d 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 b5edfff..135a72f 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);
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=fe342f50136919f1945d9a03964ee614c97d8659
commit fe342f50136919f1945d9a03964ee614c97d8659
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Dec 19 14:04:35 2014 -0800
Replace %ld with %jd and cast to intmax_t
diff --git a/ChangeLog b/ChangeLog
index 0eaa39d..a228b9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,8 @@
* stdio-common/tst-fmemopen2.c (do_test): Replace %ld with %jd
and cast to intmax_t.
* sysdeps/pthread/tst-timer.c (main): Likewise.
+ * time/clocktest.c (main): Likewise.
+ * time/tst-posixtz.c (do_test): Likewise.
2014-12-30 Andrew Senkevich <andrew.senkevich@intel.com>
H.J. Lu <hongjiu.lu@intel.com>
diff --git a/time/clocktest.c b/time/clocktest.c
index f2b3ea7..2e6457d 100644
--- a/time/clocktest.c
+++ b/time/clocktest.c
@@ -28,8 +28,8 @@ main (int argc, char ** argv)
while (!gotit);
stop = clock ();
- printf ("%ld clock ticks per second (start=%ld,stop=%ld)\n",
- stop - start, start, stop);
+ printf ("%jd clock ticks per second (start=%jd,stop=%jd)\n",
+ (intmax_t) (stop - start), (intmax_t) start, (intmax_t) stop);
printf ("CLOCKS_PER_SEC=%ld, sysconf(_SC_CLK_TCK)=%ld\n",
CLOCKS_PER_SEC, sysconf(_SC_CLK_TCK));
return 0;
diff --git a/time/tst-posixtz.c b/time/tst-posixtz.c
index c1ea267..16aa19d 100644
--- a/time/tst-posixtz.c
+++ b/time/tst-posixtz.c
@@ -39,7 +39,8 @@ do_test (void)
char buf[100];
struct tm *tmp;
- printf ("TZ = \"%s\", time = %ld => ", tests[cnt].tz, tests[cnt].when);
+ printf ("TZ = \"%s\", time = %jd => ", tests[cnt].tz,
+ (intmax_t) tests[cnt].when);
fflush (stdout);
setenv ("TZ", tests[cnt].tz, 1);
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=37f469007dd6420bdc0607d0cda63513c42305d9
commit 37f469007dd6420bdc0607d0cda63513c42305d9
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Dec 19 14:02:58 2014 -0800
Replace %ld with %jd and cast to intmax_t
diff --git a/ChangeLog b/ChangeLog
index b3d16af..0eaa39d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,7 @@
(do_test): Likewise.
* stdio-common/tst-fmemopen2.c (do_test): Replace %ld with %jd
and cast to intmax_t.
+ * sysdeps/pthread/tst-timer.c (main): Likewise.
2014-12-30 Andrew Senkevich <andrew.senkevich@intel.com>
H.J. Lu <hongjiu.lu@intel.com>
diff --git a/sysdeps/pthread/tst-timer.c b/sysdeps/pthread/tst-timer.c
index 16adf3c..f310f6e 100644
--- a/sysdeps/pthread/tst-timer.c
+++ b/sysdeps/pthread/tst-timer.c
@@ -90,13 +90,13 @@ main (void)
setvbuf (stdout, 0, _IOLBF, 0);
- printf ("clock_gettime returned %d, timespec = { %ld, %ld }\n",
- retval, ts.tv_sec, ts.tv_nsec);
+ printf ("clock_gettime returned %d, timespec = { %jd, %jd }\n",
+ retval, (intmax_t) ts.tv_sec, (intmax_t) ts.tv_nsec);
retval = clock_getres (CLOCK_REALTIME, &ts);
- printf ("clock_getres returned %d, timespec = { %ld, %ld }\n",
- retval, ts.tv_sec, ts.tv_nsec);
+ printf ("clock_getres returned %d, timespec = { %jd, %jd }\n",
+ retval, (intmax_t) ts.tv_sec, (intmax_t) ts.tv_nsec);
if (timer_create (CLOCK_REALTIME, &sigev1, &timer_sig) != 0)
{
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=ad86fbc3d5e4bab709d162f40e5d1a19ab8f3f6b
commit ad86fbc3d5e4bab709d162f40e5d1a19ab8f3f6b
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Dec 19 14:01:40 2014 -0800
Replace %ld with %jd and cast to intmax_t
diff --git a/ChangeLog b/ChangeLog
index 7def2b6..b3d16af 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 c2a4baa..e9d8b63 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);
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5d619de4610fa00d0b633e1916c49e59824440ff
commit 5d619de4610fa00d0b633e1916c49e59824440ff
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Dec 19 14:00:59 2014 -0800
Replace %ld/%lu with %jd/%ju and cast to intmax_t/uintmax_t
diff --git a/ChangeLog b/ChangeLog
index 67a13b0..7def2b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,20 @@
(do_test): Replace %ld with %jd and cast to intmax_t.
* posix/tst-regex.c (run_test): Likewise.
(run_test_backwards): Likewise.
+ * rt/tst-clock.c: Include <stdint.h>.
+ (clock_test): Replace %ld with %jd and cast to intmax_t.
+ * rt/tst-cpuclock1.c: Include <stdint.h>.
+ (do_test): Replace %lu with %ju and cast to uintmax_t.
+ * rt/tst-cpuclock2.c: Include <stdint.h>.
+ (do_test): Replace %lu with %ju and cast to uintmax_t.
+ * rt/tst-mqueue1.c: Include <stdint.h>.
+ (check_attrs): Replace %ld with %jd and cast to intmax_t.
+ * rt/tst-mqueue3.c (fct): Replace %ld with %jd and cast to
+ intmax_t.
+ * rt/tst-mqueue4.c (do_test): Likewise.
+ * rt/tst-timer4.c: Include <stdint.h>.
+ (check_ts): Replace %ld with %jd and cast to intmax_t.
+ (do_test): Likewise.
2014-12-30 Andrew Senkevich <andrew.senkevich@intel.com>
H.J. Lu <hongjiu.lu@intel.com>
diff --git a/rt/tst-clock.c b/rt/tst-clock.c
index f6133f5..1cfdcfe 100644
--- a/rt/tst-clock.c
+++ b/rt/tst-clock.c
@@ -20,6 +20,7 @@
#include <stdio.h>
#include <string.h>
#include <time.h>
+#include <stdint.h>
/* We want to see output immediately. */
@@ -51,8 +52,8 @@ clock_test (clockid_t cl)
result = 1;
}
else
- printf ("clock %d: resolution = %ld.%09ld secs\n",
- cl, ts.tv_sec, ts.tv_nsec);
+ printf ("clock %d: resolution = %jd.%09jd secs\n",
+ cl, (intmax_t) ts.tv_sec, (intmax_t) ts.tv_nsec);
}
else
{
@@ -76,8 +77,8 @@ clock_test (clockid_t cl)
}
else
{
- printf ("clock %d: time = %ld.%09ld secs\n",
- cl, ts.tv_sec, ts.tv_nsec);
+ printf ("clock %d: time = %jd.%09jd secs\n",
+ cl, (intmax_t) ts.tv_sec, (intmax_t) ts.tv_nsec);
if (memcmp (&ts, &old_ts, sizeof ts) == 0)
{
diff --git a/rt/tst-cpuclock1.c b/rt/tst-cpuclock1.c
index f503bc2..ef140fd 100644
--- a/rt/tst-cpuclock1.c
+++ b/rt/tst-cpuclock1.c
@@ -24,6 +24,7 @@
#include <string.h>
#include <errno.h>
#include <signal.h>
+#include <stdint.h>
#include <sys/wait.h>
/* This function is intended to rack up both user and system time. */
@@ -119,8 +120,9 @@ do_test (void)
result = 1;
goto done;
}
- printf ("live PID %d clock %lx resolution %lu.%.9lu\n",
- child, (unsigned long int) child_clock, res.tv_sec, res.tv_nsec);
+ printf ("live PID %d clock %lx resolution %ju.%.9ju\n",
+ child, (unsigned long int) child_clock,
+ (uintmax_t) res.tv_sec, (uintmax_t) res.tv_nsec);
struct timespec before, after;
if (clock_gettime (child_clock, &before) < 0)
@@ -131,8 +133,8 @@ do_test (void)
goto done;
}
/* Should be close to 0.0. */
- printf ("live PID %d before sleep => %lu.%.9lu\n",
- child, before.tv_sec, before.tv_nsec);
+ printf ("live PID %d before sleep => %ju.%.9ju\n",
+ child, (uintmax_t) before.tv_sec, (uintmax_t) before.tv_nsec);
struct timespec sleeptime = { .tv_nsec = 500000000 };
if (nanosleep (&sleeptime, NULL) != 0)
@@ -150,8 +152,8 @@ do_test (void)
goto done;
}
/* Should be close to 0.5. */
- printf ("live PID %d after sleep => %lu.%.9lu\n",
- child, after.tv_sec, after.tv_nsec);
+ printf ("live PID %d after sleep => %ju.%.9ju\n",
+ child, (uintmax_t) after.tv_sec, (uintmax_t) after.tv_nsec);
struct timespec diff = { .tv_sec = after.tv_sec - before.tv_sec,
.tv_nsec = after.tv_nsec - before.tv_nsec };
@@ -164,8 +166,8 @@ do_test (void)
|| diff.tv_nsec > 600000000
|| diff.tv_nsec < 100000000)
{
- printf ("before - after %lu.%.9lu outside reasonable range\n",
- diff.tv_sec, diff.tv_nsec);
+ printf ("before - after %ju.%.9ju outside reasonable range\n",
+ (uintmax_t) diff.tv_sec, (uintmax_t) diff.tv_nsec);
result = 1;
}
@@ -203,8 +205,8 @@ do_test (void)
|| d.tv_nsec < sleeptime.tv_nsec
|| d.tv_nsec > sleeptime.tv_nsec * 2)
{
- printf ("nanosleep time %lu.%.9lu outside reasonable range\n",
- d.tv_sec, d.tv_nsec);
+ printf ("nanosleep time %ju.%.9ju outside reasonable range\n",
+ (uintmax_t) d.tv_sec, (uintmax_t) d.tv_nsec);
result = 1;
}
}
@@ -236,8 +238,8 @@ do_test (void)
goto done;
}
/* Should be close to 0.6. */
- printf ("dead PID %d => %lu.%.9lu\n",
- child, dead.tv_sec, dead.tv_nsec);
+ printf ("dead PID %d => %ju.%.9ju\n",
+ child, (uintmax_t) dead.tv_sec, (uintmax_t) dead.tv_nsec);
diff.tv_sec = dead.tv_sec - after.tv_sec;
diff.tv_nsec = dead.tv_nsec - after.tv_nsec;
@@ -248,8 +250,8 @@ do_test (void)
}
if (diff.tv_sec != 0 || diff.tv_nsec > 200000000)
{
- printf ("dead - after %lu.%.9lu outside reasonable range\n",
- diff.tv_sec, diff.tv_nsec);
+ printf ("dead - after %ju.%.9ju outside reasonable range\n",
+ (uintmax_t) diff.tv_sec, (uintmax_t) diff.tv_nsec);
result = 1;
}
@@ -265,9 +267,9 @@ do_test (void)
if (clock_gettime (child_clock, &dead) == 0)
{
- printf ("clock_gettime on reaped PID %d clock %lx => %lu%.9lu\n",
+ printf ("clock_gettime on reaped PID %d clock %lx => %ju%.9ju\n",
child, (unsigned long int) child_clock,
- dead.tv_sec, dead.tv_nsec);
+ (uintmax_t) dead.tv_sec, (uintmax_t) dead.tv_nsec);
result = 1;
}
else
@@ -280,9 +282,9 @@ do_test (void)
if (clock_getres (child_clock, &dead) == 0)
{
- printf ("clock_getres on reaped PID %d clock %lx => %lu%.9lu\n",
+ printf ("clock_getres on reaped PID %d clock %lx => %ju%.9ju\n",
child, (unsigned long int) child_clock,
- dead.tv_sec, dead.tv_nsec);
+ (uintmax_t) dead.tv_sec, (uintmax_t) dead.tv_nsec);
result = 1;
}
else
diff --git a/rt/tst-cpuclock2.c b/rt/tst-cpuclock2.c
index 8a447e1..caaa94f 100644
--- a/rt/tst-cpuclock2.c
+++ b/rt/tst-cpuclock2.c
@@ -17,6 +17,7 @@
<http://www.gnu.org/licenses/>. */
#include <unistd.h>
+#include <stdint.h>
#if (_POSIX_THREADS - 0) <= 0
@@ -221,8 +222,9 @@ do_test (void)
result = 1;
return 1;
}
- printf ("live thread clock %lx resolution %lu.%.9lu\n",
- (unsigned long int) th_clock, res.tv_sec, res.tv_nsec);
+ printf ("live thread clock %lx resolution %ju.%.9ju\n",
+ (unsigned long int) th_clock,
+ (uintmax_t) res.tv_sec, (uintmax_t) res.tv_nsec);
struct timespec process_before, process_after;
if (clock_gettime (process_clock, &process_before) < 0)
@@ -239,8 +241,8 @@ do_test (void)
(unsigned long int) th_clock, strerror (errno));
return 1;
}
- printf ("live thread before sleep => %lu.%.9lu\n",
- before.tv_sec, before.tv_nsec);
+ printf ("live thread before sleep => %ju.%.9ju\n",
+ (uintmax_t) before.tv_sec, (uintmax_t) before.tv_nsec);
struct timespec me_before, me_after;
if (clock_gettime (my_thread_clock, &me_before) < 0)
@@ -249,8 +251,8 @@ do_test (void)
(unsigned long int) my_thread_clock, strerror (errno));
return 1;
}
- printf ("self thread before sleep => %lu.%.9lu\n",
- me_before.tv_sec, me_before.tv_nsec);
+ printf ("self thread before sleep => %ju.%.9ju\n",
+ (uintmax_t) me_before.tv_sec, (uintmax_t) me_before.tv_nsec);
struct timespec sleeptime = { .tv_nsec = 500000000 };
if (nanosleep (&sleeptime, NULL) != 0)
@@ -265,8 +267,8 @@ do_test (void)
(unsigned long int) th_clock, strerror (errno));
return 1;
}
- printf ("live thread after sleep => %lu.%.9lu\n",
- after.tv_sec, after.tv_nsec);
+ printf ("live thread after sleep => %ju.%.9ju\n",
+ (uintmax_t) after.tv_sec, (uintmax_t) after.tv_nsec);
if (clock_gettime (process_clock, &process_after) < 0)
{
@@ -281,8 +283,8 @@ do_test (void)
(unsigned long int) my_thread_clock, strerror (errno));
return 1;
}
- printf ("self thread after sleep => %lu.%.9lu\n",
- me_after.tv_sec, me_after.tv_nsec);
+ printf ("self thread after sleep => %ju.%.9ju\n",
+ (uintmax_t) me_after.tv_sec, (uintmax_t) me_after.tv_nsec);
unsigned long long int th_diff = tsdiff (&before, &after);
unsigned long long int pdiff = tsdiff (&process_before, &process_after);
diff --git a/rt/tst-mqueue1.c b/rt/tst-mqueue1.c
index c242c37..e310fb3 100644
--- a/rt/tst-mqueue1.c
+++ b/rt/tst-mqueue1.c
@@ -26,6 +26,7 @@
#include <sys/wait.h>
#include <time.h>
#include <unistd.h>
+#include <stdint.h>
#include "tst-mqueue.h"
static int
@@ -46,20 +47,21 @@ check_attrs (struct mq_attr *attr, int nonblock, long cnt)
if (attr->mq_maxmsg != 10 || attr->mq_msgsize != 1)
{
printf ("attributes don't match those passed to mq_open\n"
- "mq_maxmsg %ld, mq_msgsize %ld\n",
- attr->mq_maxmsg, attr->mq_msgsize);
+ "mq_maxmsg %jd, mq_msgsize %jd\n",
+ (intmax_t) attr->mq_maxmsg, (intmax_t) attr->mq_msgsize);
result = 1;
}
if ((attr->mq_flags & O_NONBLOCK) != nonblock)
{
- printf ("mq_flags %lx != %x\n", (attr->mq_flags & O_NONBLOCK), nonblock);
+ printf ("mq_flags %jx != %x\n",
+ (intmax_t) (attr->mq_flags & O_NONBLOCK), nonblock);
result = 1;
}
if (attr->mq_curmsgs != cnt)
{
- printf ("mq_curmsgs %ld != %ld\n", attr->mq_curmsgs, cnt);
+ printf ("mq_curmsgs %jd != %ld\n", (intmax_t) attr->mq_curmsgs, cnt);
result = 1;
}
diff --git a/rt/tst-mqueue3.c b/rt/tst-mqueue3.c
index 4607e1b..c7270a1 100644
--- a/rt/tst-mqueue3.c
+++ b/rt/tst-mqueue3.c
@@ -61,14 +61,14 @@ fct (union sigval s)
/* Check the values. */
if (attr.mq_maxmsg != MAXMSG)
{
- printf ("%s: mq_maxmsg wrong: is %ld, expecte %d\n",
- __FUNCTION__, attr.mq_maxmsg, MAXMSG);
+ printf ("%s: mq_maxmsg wrong: is %jd, expecte %d\n",
+ __FUNCTION__, (intmax_t) attr.mq_maxmsg, MAXMSG);
exit (1);
}
if (attr.mq_msgsize != MAXMSG)
{
- printf ("%s: mq_msgsize wrong: is %ld, expecte %d\n",
- __FUNCTION__, attr.mq_msgsize, MSGSIZE);
+ printf ("%s: mq_msgsize wrong: is %jd, expecte %d\n",
+ __FUNCTION__, (intmax_t) attr.mq_msgsize, MSGSIZE);
exit (1);
}
diff --git a/rt/tst-mqueue4.c b/rt/tst-mqueue4.c
index 60603be..d6733c2 100644
--- a/rt/tst-mqueue4.c
+++ b/rt/tst-mqueue4.c
@@ -139,9 +139,10 @@ do_test (void)
|| attr.mq_msgsize != 2
|| attr.mq_curmsgs != 2)
{
- printf ("mq_getattr returned unexpected { .mq_flags = %ld,\n"
- ".mq_maxmsg = %ld, .mq_msgsize = %ld, .mq_curmsgs = %ld }\n",
- attr.mq_flags, attr.mq_maxmsg, attr.mq_msgsize, attr.mq_curmsgs);
+ printf ("mq_getattr returned unexpected { .mq_flags = %jd,\n"
+ ".mq_maxmsg = %jd, .mq_msgsize = %jd, .mq_curmsgs = %jd }\n",
+ (intmax_t) attr.mq_flags, (intmax_t) attr.mq_maxmsg,
+ (intmax_t) attr.mq_msgsize, (intmax_t) attr.mq_curmsgs);
result = 1;
}
@@ -215,9 +216,10 @@ do_test (void)
|| attr.mq_msgsize != 2
|| attr.mq_curmsgs != 1)
{
- printf ("mq_getattr returned unexpected { .mq_flags = %ld,\n"
- ".mq_maxmsg = %ld, .mq_msgsize = %ld, .mq_curmsgs = %ld }\n",
- attr.mq_flags, attr.mq_maxmsg, attr.mq_msgsize, attr.mq_curmsgs);
+ printf ("mq_getattr returned unexpected { .mq_flags = %jd,\n"
+ ".mq_maxmsg = %jd, .mq_msgsize = %jd, .mq_curmsgs = %jd }\n",
+ (intmax_t) attr.mq_flags, (intmax_t) attr.mq_maxmsg,
+ (intmax_t) attr.mq_msgsize, (intmax_t) attr.mq_curmsgs);
result = 1;
}
diff --git a/rt/tst-timer4.c b/rt/tst-timer4.c
index f64fadd..a397663 100644
--- a/rt/tst-timer4.c
+++ b/rt/tst-timer4.c
@@ -23,6 +23,7 @@
#include <string.h>
#include <time.h>
#include <unistd.h>
+#include <stdint.h>
#if _POSIX_THREADS
# include <pthread.h>
@@ -168,9 +169,9 @@ check_ts (const char *name, const struct timespec *start,
|| (end->tv_sec == ts.tv_sec && end->tv_nsec < ts.tv_nsec))
{
printf ("\
-*** timer %s invoked too soon: %ld.%09ld instead of expected %ld.%09ld\n",
- name, (long) end->tv_sec, end->tv_nsec,
- (long) ts.tv_sec, ts.tv_nsec);
+*** timer %s invoked too soon: %ld.%09jd instead of expected %ld.%09jd\n",
+ name, (long) end->tv_sec, (intmax_t) end->tv_nsec,
+ (long) ts.tv_sec, (intmax_t) ts.tv_nsec);
return 1;
}
else
@@ -200,8 +201,8 @@ do_test (void)
result = 1;
}
else
- printf ("clock_gettime returned timespec = { %ld, %ld }\n",
- (long) ts.tv_sec, ts.tv_nsec);
+ printf ("clock_gettime returned timespec = { %ld, %jd }\n",
+ (long) ts.tv_sec, (intmax_t) ts.tv_nsec);
if (clock_getres (TEST_CLOCK, &ts) != 0)
{
@@ -209,8 +210,8 @@ do_test (void)
result = 1;
}
else
- printf ("clock_getres returned timespec = { %ld, %ld }\n",
- (long) ts.tv_sec, ts.tv_nsec);
+ printf ("clock_getres returned timespec = { %ld, %jd }\n",
+ (long) ts.tv_sec, (intmax_t) ts.tv_nsec);
struct sigevent ev;
memset (&ev, 0x11, sizeof (ev));
@@ -488,9 +489,9 @@ do_test (void)
|| it.it_interval.tv_sec || it.it_interval.tv_nsec)
{
printf ("\
-*** timer_gettime timer_none returned { %ld.%09ld, %ld.%09ld }\n",
- (long) it.it_value.tv_sec, it.it_value.tv_nsec,
- (long) it.it_interval.tv_sec, it.it_interval.tv_nsec);
+*** timer_gettime timer_none returned { %ld.%09jd, %ld.%09jd }\n",
+ (long) it.it_value.tv_sec, (intmax_t) it.it_value.tv_nsec,
+ (long) it.it_interval.tv_sec, (intmax_t) it.it_interval.tv_nsec);
result = 1;
}
@@ -603,8 +604,8 @@ do_test (void)
else if (it.it_interval.tv_sec || it.it_interval.tv_nsec != 100000000)
{
printf ("\
-!!! second timer_gettime timer_none returned it_interval %ld.%09ld\n",
- (long) it.it_interval.tv_sec, it.it_interval.tv_nsec);
+!!! second timer_gettime timer_none returned it_interval %ld.%09jd\n",
+ (long) it.it_interval.tv_sec, (intmax_t) it.it_interval.tv_nsec);
/* FIXME: For now disabled.
result = 1; */
}
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=6490d945378090db82be2759ff66719a980d9c1c
commit 6490d945378090db82be2759ff66719a980d9c1c
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Dec 19 13:52:08 2014 -0800
Replace %ld with %jd and cast to intmax_t
diff --git a/ChangeLog b/ChangeLog
index 075ecbc..67a13b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
* libio/tst-ftell-active-handler.c (do_append_test): Likewise.
* nptl/tst-mutex5.c: Include <stdint.h>.
(do_test): Replace %ld with %jd and cast to intmax_t.
+ * posix/tst-regex.c (run_test): Likewise.
+ (run_test_backwards): Likewise.
2014-12-30 Andrew Senkevich <andrew.senkevich@intel.com>
H.J. Lu <hongjiu.lu@intel.com>
diff --git a/posix/tst-regex.c b/posix/tst-regex.c
index 7df0bd1..0e086ab 100644
--- a/posix/tst-regex.c
+++ b/posix/tst-regex.c
@@ -274,8 +274,8 @@ run_test (const char *expr, const char *mem, size_t memlen, int icase,
finish.tv_sec -= start.tv_sec;
}
- printf ("elapsed time: %ld.%09ld sec\n",
- finish.tv_sec, finish.tv_nsec);
+ printf ("elapsed time: %jd.%09jd sec\n",
+ (intmax_t) finish.tv_sec, (intmax_t) finish.tv_nsec);
}
}
@@ -327,8 +327,8 @@ run_test (const char *expr, const char *mem, size_t memlen, int icase,
mintime = finish;
}
}
- printf ("elapsed time: %ld.%09ld sec\n",
- mintime.tv_sec, mintime.tv_nsec);
+ printf ("elapsed time: %jd.%09jd sec\n",
+ (intmax_t) mintime.tv_sec, (intmax_t) mintime.tv_nsec);
}
#endif
@@ -420,8 +420,8 @@ run_test_backwards (const char *expr, const char *mem, size_t memlen,
finish.tv_sec -= start.tv_sec;
}
- printf ("elapsed time: %ld.%09ld sec\n",
- finish.tv_sec, finish.tv_nsec);
+ printf ("elapsed time: %jd.%09jd sec\n",
+ (intmax_t) finish.tv_sec, (intmax_t) finish.tv_nsec);
}
}
@@ -489,8 +489,8 @@ run_test_backwards (const char *expr, const char *mem, size_t memlen,
mintime = finish;
}
}
- printf ("elapsed time: %ld.%09ld sec\n",
- mintime.tv_sec, mintime.tv_nsec);
+ printf ("elapsed time: %jd.%09jd sec\n",
+ (intmax_t) mintime.tv_sec, (intmax_t) mintime.tv_nsec);
}
#endif
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=e401d5ca5d10c82f4e35bd9be7098b620ba04746
commit e401d5ca5d10c82f4e35bd9be7098b620ba04746
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Dec 19 13:51:13 2014 -0800
Replace %ld with %jd and cast to intmax_t
diff --git a/ChangeLog b/ChangeLog
index d5166df..075ecbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
* io/test-utime.c (main): Replace %ld with %jd and cast to
intmax_t.
* libio/tst-ftell-active-handler.c (do_append_test): Likewise.
+ * nptl/tst-mutex5.c: Include <stdint.h>.
+ (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/nptl/tst-mutex5.c b/nptl/tst-mutex5.c
index 6988840..48e1ea8 100644
--- a/nptl/tst-mutex5.c
+++ b/nptl/tst-mutex5.c
@@ -22,6 +22,7 @@
#include <time.h>
#include <unistd.h>
#include <sys/time.h>
+#include <stdint.h>
#include <config.h>
@@ -132,8 +133,8 @@ do_test (void)
if (tv2.tv_sec < 2)
{
- printf ("premature timeout: %ld.%06ld difference\n",
- tv2.tv_sec, tv2.tv_usec);
+ printf ("premature timeout: %jd.%06jd difference\n",
+ (intmax_t) tv2.tv_sec, (intmax_t) tv2.tv_usec);
return 1;
}
}
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=41fad83083a21800aafb08fbc888f05ae44d6c8a
commit 41fad83083a21800aafb08fbc888f05ae44d6c8a
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Dec 19 13:49:58 2014 -0800
Replace %ld with %jd and cast to intmax_t
diff --git a/ChangeLog b/ChangeLog
index b972232..d5166df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
[BZ #17732]
* io/test-utime.c (main): Replace %ld with %jd and cast to
intmax_t.
+ * libio/tst-ftell-active-handler.c (do_append_test): Likewise.
2014-12-30 Andrew Senkevich <andrew.senkevich@intel.com>
H.J. Lu <hongjiu.lu@intel.com>
diff --git a/libio/tst-ftell-active-handler.c b/libio/tst-ftell-active-handler.c
index 7be75bc..186aec6 100644
--- a/libio/tst-ftell-active-handler.c
+++ b/libio/tst-ftell-active-handler.c
@@ -574,23 +574,23 @@ do_append_test (const char *filename)
if (seek_ret != new_seek_ret)
{
- printf ("incorrectly modified file offset to %ld, should be %ld",
- new_seek_ret, seek_ret);
+ printf ("incorrectly modified file offset to %jd, should be %jd",
+ (intmax_t) new_seek_ret, (intmax_t) seek_ret);
ret |= 1;
}
else
- printf ("retained current file offset %ld", seek_ret);
+ printf ("retained current file offset %jd", (intmax_t) seek_ret);
new_seek_ret = ftello (fp);
if (seek_ret != new_seek_ret)
{
- printf (", ftello reported incorrect offset %ld, should be %ld\n",
- new_seek_ret, seek_ret);
+ printf (", ftello reported incorrect offset %jd, should be %jd\n",
+ (intmax_t) new_seek_ret, (intmax_t) seek_ret);
ret |= 1;
}
else
- printf (", ftello reported correct offset %ld\n", seek_ret);
+ printf (", ftello reported correct offset %jd\n", (intmax_t) seek_ret);
fclose (fp);
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=8d2b2763fc11da99e0e6b1ea7c0e3d556380e169
commit 8d2b2763fc11da99e0e6b1ea7c0e3d556380e169
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Dec 19 13:48:40 2014 -0800
Replace %ld with %jd and cast to intmax_t
diff --git a/ChangeLog b/ChangeLog
index 3125219..b972232 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-12-30 H.J. Lu <hongjiu.lu@intel.com>
+
+ [BZ #17732]
+ * io/test-utime.c (main): 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/io/test-utime.c b/io/test-utime.c
index 26a5464..afb8a29 100644
--- a/io/test-utime.c
+++ b/io/test-utime.c
@@ -109,25 +109,29 @@ main (int argc, char *argv[])
if (st.st_mtime != ut.modtime)
{
- printf ("modtime %ld != %ld\n", st.st_mtime, ut.modtime);
+ printf ("modtime %jd != %jd\n",
+ (intmax_t) st.st_mtime, (intmax_t) ut.modtime);
return 1;
}
if (st.st_atime != ut.actime)
{
- printf ("actime %ld != %ld\n", st.st_atime, ut.actime);
+ printf ("actime %jd != %jd\n",
+ (intmax_t) st.st_atime, (intmax_t) ut.actime);
return 1;
}
if (stnow.st_mtime < now1 || stnow.st_mtime > now2)
{
- printf ("modtime %ld <%ld >%ld\n", stnow.st_mtime, now1, now2);
+ printf ("modtime %jd <%jd >%jd\n",
+ (intmax_t) stnow.st_mtime, (intmax_t) now1, (intmax_t) now2);
return 1;
}
if (stnow.st_atime < now1 || stnow.st_atime > now2)
{
- printf ("actime %ld <%ld >%ld\n", stnow.st_atime, now1, now2);
+ printf ("actime %jd <%jd >%jd\n",
+ (intmax_t) stnow.st_atime, (intmax_t) now1, (intmax_t) now2);
return 1;
}
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 31 +++++++++++++++++++++++++++++++
NEWS | 2 +-
io/test-utime.c | 12 ++++++++----
libio/tst-ftell-active-handler.c | 12 ++++++------
nptl/tst-mutex5.c | 5 +++--
posix/tst-regex.c | 16 ++++++++--------
rt/tst-clock.c | 9 +++++----
rt/tst-cpuclock1.c | 38 ++++++++++++++++++++------------------
rt/tst-cpuclock2.c | 22 ++++++++++++----------
rt/tst-mqueue1.c | 10 ++++++----
rt/tst-mqueue3.c | 8 ++++----
rt/tst-mqueue4.c | 14 ++++++++------
rt/tst-timer4.c | 25 +++++++++++++------------
stdio-common/tst-fmemopen2.c | 11 +++++++----
sysdeps/pthread/tst-timer.c | 8 ++++----
time/clocktest.c | 4 ++--
time/tst-posixtz.c | 3 ++-
timezone/tst-timezone.c | 8 ++++----
18 files changed, 144 insertions(+), 94 deletions(-)
hooks/post-receive
--
GNU C Library master sources