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.16-ports-merge-597-gb5dcacb
- From: schwab at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 2 Nov 2012 21:53:06 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-597-gb5dcacb
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 b5dcacb4502be39d30efd2f928b9a30c91eeb0d3 (commit)
from f7934be8f6bb5f47def626af7bd9098e8fb3e950 (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://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=b5dcacb4502be39d30efd2f928b9a30c91eeb0d3
commit b5dcacb4502be39d30efd2f928b9a30c91eeb0d3
Author: Andreas Schwab <schwab@linux-m68k.org>
Date: Fri Nov 2 20:04:52 2012 +0100
Fix printf format mismatches
diff --git a/ChangeLog b/ChangeLog
index a762760..798a816 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-02 Andreas Schwab <schwab@linux-m68k.org>
+
+ * iconvdata/bug-iconv8.c (do_test): Use %z for size_t arguments.
+ * iconvdata/bug-iconv9.c (do_test): Use %t for ptrdiff_t
+ arguments.
+
2012-11-02 Roland McGrath <roland@hack.frob.com>
* aclocal.m4 (GLIBC_AUTOCONF_VERSION): New macro.
diff --git a/iconvdata/bug-iconv8.c b/iconvdata/bug-iconv8.c
index 54c6be2..b91dc1d 100644
--- a/iconvdata/bug-iconv8.c
+++ b/iconvdata/bug-iconv8.c
@@ -24,7 +24,7 @@ do_test (void)
ret = iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
iconv_close(cd);
- printf("result: %ld %d %ld %d\n", ret, errno, inbytesleft, inbuf[0]);
+ printf("result: %zd %d %zd %d\n", ret, errno, inbytesleft, inbuf[0]);
/*
* result: -1 84 0 0 (84=EILSEQ)
diff --git a/iconvdata/bug-iconv9.c b/iconvdata/bug-iconv9.c
index e4ffd59..28f88d2 100644
--- a/iconvdata/bug-iconv9.c
+++ b/iconvdata/bug-iconv9.c
@@ -37,7 +37,7 @@ do_test (void)
}
if (in != inbuf + sizeof (inbuf) - 1)
{
- printf ("in advanced by %jd, expected %zu\n",
+ printf ("in advanced by %td, expected %zu\n",
in - inbuf, sizeof (inbuf) - 1);
res = 1;
}
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
iconvdata/bug-iconv8.c | 2 +-
iconvdata/bug-iconv9.c | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources