|
 |
978e96 |
commit ab9f6255ab4e7aa353ec1b61b4f332bf00cea4d0
|
|
|
978e96 |
Author: Stefan Liebler <stli@linux.vnet.ibm.com>
|
|
|
978e96 |
Date: Wed Jan 20 08:32:37 2016 +0100
|
|
|
978e96 |
|
|
|
978e96 |
S390: Fix build error in iconvdata/bug-iconv11.c.
|
|
|
978e96 |
|
|
|
978e96 |
This fixes the following build error on S390 31bit while building the test
|
|
|
978e96 |
iconvdata/bug-iconv11.c with gcc 5.3:
|
|
|
978e96 |
bug-iconv11.c: In function ‘test_ibm93x’:
|
|
|
978e96 |
bug-iconv11.c:59:11: error: format ‘%td’ expects argument of type ‘ptrdiff_t’, but argument 2 has type ‘size_t {aka long unsigned int}’ [-Werror=format=]
|
|
|
978e96 |
printf (" ==> %td: %s\n"
|
|
|
978e96 |
^
|
|
|
978e96 |
cc1: all warnings being treated as errors
|
|
|
978e96 |
|
|
|
978e96 |
This patch uses %zu format specifier for argument size_t ret instead of %td.
|
|
|
978e96 |
|
|
|
978e96 |
ChangeLog:
|
|
|
978e96 |
|
|
|
978e96 |
* iconvdata/bug-iconv11.c (test_ibm93x):
|
|
|
978e96 |
Use %zu printf format specifier for size_t argument.
|
|
|
978e96 |
|
|
|
978e96 |
diff --git a/iconvdata/bug-iconv11.c b/iconvdata/bug-iconv11.c
|
|
|
978e96 |
index 6cdc07d79883454d..5b9d9a36af0b4bcf 100644
|
|
|
978e96 |
--- a/iconvdata/bug-iconv11.c
|
|
|
978e96 |
+++ b/iconvdata/bug-iconv11.c
|
|
|
978e96 |
@@ -56,7 +56,7 @@ test_ibm93x (const char *from_set, const char *input, size_t inbytesleft)
|
|
|
978e96 |
|
|
|
978e96 |
errno = 0;
|
|
|
978e96 |
size_t ret = iconv (cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
|
|
|
978e96 |
- printf (" ==> %td: %s\n"
|
|
|
978e96 |
+ printf (" ==> %zu: %s\n"
|
|
|
978e96 |
" inbuf%+td, inbytesleft=%zu, outbuf%+td, outbytesleft=%zu\n",
|
|
|
978e96 |
ret, strerror (errno),
|
|
|
978e96 |
inbuf - input, inbytesleft, outbuf - output, outbytesleft);
|