From 9a2d7205aa046af3f4caf1b35388e9100e2a25db Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 30 Sep 2002 07:47:16 +0000 Subject: [PATCH] Fix format strings. --- catgets/tst-catgets.c | 2 +- io/tst-getcwd.c | 2 +- libio/tst-fgetws.c | 6 +++--- libio/tst_swprintf.c | 4 ++-- posix/bug-regex11.c | 4 ++-- posix/bug-regex12.c | 4 ++-- posix/tst-mmap.c | 4 ++-- stdio-common/tst-rndseek.c | 2 +- stdlib/tst-bsearch.c | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/catgets/tst-catgets.c b/catgets/tst-catgets.c index 9936554200..fdaa834949 100644 --- a/catgets/tst-catgets.c +++ b/catgets/tst-catgets.c @@ -45,7 +45,7 @@ main (void) if (trans == NULL) { - printf ("catgets return NULL for %d\n", cnt); + printf ("catgets return NULL for %zd\n", cnt); result = 1; } else if (strcmp (trans, msgs[cnt]) != 0 && msgs[cnt][0] != '\0') diff --git a/io/tst-getcwd.c b/io/tst-getcwd.c index f53f93cf0a..421eb18b5e 100644 --- a/io/tst-getcwd.c +++ b/io/tst-getcwd.c @@ -152,7 +152,7 @@ getcwd (NULL, sbs) = \"%s\", getcwd (thepath, sizeof thepath) = \"%s\"\n", for (i = len + 1; i < sizeof thepath; ++i) if (thepath[i] != '\xff') { - printf ("thepath[%d] != '\xff'\n", i); + printf ("thepath[%zd] != '\xff'\n", i); return 1; } diff --git a/libio/tst-fgetws.c b/libio/tst-fgetws.c index 66fb9d1d8e..1e29332743 100644 --- a/libio/tst-fgetws.c +++ b/libio/tst-fgetws.c @@ -91,7 +91,7 @@ main (int argc, char *argv[]) { printf ("Return Value: %p\n", ret); for (i = 0; i < wcslen (wcs) + 1; i++) - printf (" wcs[%d] = %04x", i, (unsigned int)wcs[i]); + printf (" wcs[%zd] = %04x", i, (unsigned int)wcs[i]); printf ("\n"); result = 1; } @@ -127,7 +127,7 @@ main (int argc, char *argv[]) printf ("Return Value: %p\n", ret); for (i = 0; i < wcslen (wcs) + 1; i++) - printf (" wcs[%d] = 0x%04x", i, (unsigned int)wcs[i]); + printf (" wcs[%zd] = 0x%04x", i, (unsigned int)wcs[i]); printf ("\n"); for (i = 0; il_str2[i] != '\n'; ++i) @@ -172,7 +172,7 @@ main (int argc, char *argv[]) { printf ("Return Value: %p\n", ret); for (i = 0; i < wcslen (wcs) + 1; i++) - printf (" wcs[%d] = 0x%04x", i, (unsigned int)wcs[i]); + printf (" wcs[%zd] = 0x%04x", i, (unsigned int)wcs[i]); printf ("\n"); } diff --git a/libio/tst_swprintf.c b/libio/tst_swprintf.c index 4dadd58741..e4bd7f022a 100644 --- a/libio/tst_swprintf.c +++ b/libio/tst_swprintf.c @@ -28,7 +28,7 @@ main (int argc, char *argv[]) n = swprintf (buf, nbuf, L"Hello %s", "world"); if (n != 11) { - printf ("incorrect return value: %d instead of 11\n", n); + printf ("incorrect return value: %zd instead of 11\n", n); result = 1; } else if (wcscmp (buf, L"Hello world") != 0) @@ -41,7 +41,7 @@ main (int argc, char *argv[]) n = swprintf (buf, nbuf, L"Is this >%g< 3.1?", 3.1); if (n != 18) { - printf ("incorrect return value: %d instead of 18\n", n); + printf ("incorrect return value: %zd instead of 18\n", n); result = 1; } else if (wcscmp (buf, L"Is this >3.1< 3.1?") != 0) diff --git a/posix/bug-regex11.c b/posix/bug-regex11.c index 5c8179d675..d6fc4153e2 100644 --- a/posix/bug-regex11.c +++ b/posix/bug-regex11.c @@ -58,14 +58,14 @@ main (void) { char buf[500]; regerror (n, &re, buf, sizeof (buf)); - printf ("regcomp %d failed: %s\n", i, buf); + printf ("regcomp %zd failed: %s\n", i, buf); ret = 1; continue; } if (regexec (&re, tests[i].string, tests[i].nmatch, rm, 0)) { - printf ("regexec %d failed\n", i); + printf ("regexec %zd failed\n", i); ret = 1; regfree (&re); continue; diff --git a/posix/bug-regex12.c b/posix/bug-regex12.c index 2464991ad4..d5b5ef106e 100644 --- a/posix/bug-regex12.c +++ b/posix/bug-regex12.c @@ -52,7 +52,7 @@ main (void) { char buf[500]; regerror (n, &re, buf, sizeof (buf)); - printf ("regcomp %d failed: %s\n", i, buf); + printf ("regcomp %zd failed: %s\n", i, buf); ret = 1; continue; } @@ -60,7 +60,7 @@ main (void) if (! regexec (&re, tests[i].string, tests[i].nmatch, tests[i].nmatch ? rm : NULL, 0)) { - printf ("regexec %d incorrectly matched\n", i); + printf ("regexec %zd incorrectly matched\n", i); ret = 1; } diff --git a/posix/tst-mmap.c b/posix/tst-mmap.c index e4db364301..355a784124 100644 --- a/posix/tst-mmap.c +++ b/posix/tst-mmap.c @@ -167,7 +167,7 @@ main (void) for (c = ps; c < ps + 1000; ++c) if (ptr[c - ps] != '0' + (c % 10)) { - printf ("wrong data mapped at offset %d\n", c); + printf ("wrong data mapped at offset %zd\n", c); result = 1; } } @@ -187,7 +187,7 @@ main (void) for (c = ps; c < ps + 1000; ++c) if (ptr[c - ps] != '0' + (c % 10)) { - printf ("wrong data mapped at offset %d\n", c); + printf ("wrong data mapped at offset %zd\n", c); result = 1; } } diff --git a/stdio-common/tst-rndseek.c b/stdio-common/tst-rndseek.c index 61b919c002..eafe0b4278 100644 --- a/stdio-common/tst-rndseek.c +++ b/stdio-common/tst-rndseek.c @@ -117,7 +117,7 @@ do_test (void) if (ch1 != ch2) { - printf ("%d: '%c' vs '%c'\n", i, ch1, ch2); + printf ("%zd: '%c' vs '%c'\n", i, ch1, ch2); return 1; } } diff --git a/stdlib/tst-bsearch.c b/stdlib/tst-bsearch.c index 04ec02a411..ad80776785 100644 --- a/stdlib/tst-bsearch.c +++ b/stdlib/tst-bsearch.c @@ -67,7 +67,7 @@ main (void) res = (struct entry *) bsearch (&key, arr, narr, sizeof (arr[0]), comp); if (res == NULL) { - printf ("entry %d not found\n", cnt); + printf ("entry %zd not found\n", cnt); result = 1; } else if (res != &arr[cnt]) @@ -112,7 +112,7 @@ main (void) { if (res == NULL) { - printf ("entry %d not found\n", cnt); + printf ("entry %zd not found\n", cnt); result = 1; } else if (res != &arr[cnt])