diff options
31 files changed, 111 insertions, 89 deletions
@@ -1,5 +1,14 @@ 2002-08-25 Ulrich Drepper <drepper@redhat.com> + * libio/tst-freopen.c (main): Use correct formats for __LINE__. + * libio/tst-mmap-setvbuf.c (main): Likewise. + * libio/tst-widetext.c (main): Likewise. + + * libio/tst-mmap-eofsync.c (do_test): Use correct format in error + message. + * libio/tst-mmap-fflushsync.c (do_test): Likewise. + * libio/tst-mmap2-eofsync.c (do_test): Likewise. + * sysdeps/i386/elf/configure.in: Unconditionally define PI_STATIC_AND_HIDDEN. * elf/rtld.c (DONT_USE_BOOTSTRAP_MAP): Define only if diff --git a/libio/tst-freopen.c b/libio/tst-freopen.c index 8228951071..2b71b1f492 100644 --- a/libio/tst-freopen.c +++ b/libio/tst-freopen.c @@ -34,14 +34,14 @@ main (void) if (fd == -1) { - printf ("%Zd: cannot open temporary file: %m\n", __LINE__); + printf ("%u: cannot open temporary file: %m\n", __LINE__); exit (1); } f = fdopen (fd, "w"); if (f == NULL) { - printf ("%Zd: cannot fdopen temporary file: %m\n", __LINE__); + printf ("%u: cannot fdopen temporary file: %m\n", __LINE__); exit (1); } @@ -51,20 +51,20 @@ main (void) f = fopen (name, "r"); if (f == NULL) { - printf ("%Zd: cannot fopen temporary file: %m\n", __LINE__); + printf ("%u: cannot fopen temporary file: %m\n", __LINE__); exit (1); } if (fread (temp, 1, strlen (test), f) != strlen (test)) { - printf ("%Zd: couldn't read the file back: %m\n", __LINE__); + printf ("%u: couldn't read the file back: %m\n", __LINE__); exit (1); } temp [strlen (test)] = '\0'; if (strcmp (test, temp)) { - printf ("%Zd: read different string than was written:\n%s%s", + printf ("%u: read different string than was written:\n%s%s", __LINE__, test, temp); exit (1); } @@ -72,26 +72,26 @@ main (void) f = freopen (name, "r+", f); if (f == NULL) { - printf ("%Zd: cannot freopen temporary file: %m\n", __LINE__); + printf ("%u: cannot freopen temporary file: %m\n", __LINE__); exit (1); } if (fseek (f, 0, SEEK_SET) != 0) { - printf ("%Zd: couldn't fseek to start: %m\n", __LINE__); + printf ("%u: couldn't fseek to start: %m\n", __LINE__); exit (1); } if (fread (temp, 1, strlen (test), f) != strlen (test)) { - printf ("%Zd: couldn't read the file back: %m\n", __LINE__); + printf ("%u: couldn't read the file back: %m\n", __LINE__); exit (1); } temp [strlen (test)] = '\0'; if (strcmp (test, temp)) { - printf ("%Zd: read different string than was written:\n%s%s", + printf ("%u: read different string than was written:\n%s%s", __LINE__, test, temp); exit (1); } diff --git a/libio/tst-mmap-eofsync.c b/libio/tst-mmap-eofsync.c index 909e868f7b..73748369ad 100644 --- a/libio/tst-mmap-eofsync.c +++ b/libio/tst-mmap-eofsync.c @@ -78,7 +78,7 @@ do_test (void) printf ("wrote more to file\n"); else { - printf ("wrote %d != %d (%m)\n", c, sizeof text2 - 1); + printf ("wrote %d != %zd (%m)\n", c, sizeof text2 - 1); result = 1; } diff --git a/libio/tst-mmap-fflushsync.c b/libio/tst-mmap-fflushsync.c index f4d688f568..a4580e980b 100644 --- a/libio/tst-mmap-fflushsync.c +++ b/libio/tst-mmap-fflushsync.c @@ -71,7 +71,7 @@ do_test (void) printf ("wrote more to file\n"); else { - printf ("wrote %d != %d (%m)\n", c, sizeof text2 - 1); + printf ("wrote %d != %zd (%m)\n", c, sizeof text2 - 1); result = 1; } diff --git a/libio/tst-mmap-setvbuf.c b/libio/tst-mmap-setvbuf.c index 6fe9ce3482..47854b714e 100644 --- a/libio/tst-mmap-setvbuf.c +++ b/libio/tst-mmap-setvbuf.c @@ -34,14 +34,14 @@ int main (void) if (fd == -1) { - printf ("%Zd: cannot open temporary file: %m\n", __LINE__); + printf ("%u: cannot open temporary file: %m\n", __LINE__); exit (1); } f = fdopen (fd, "w"); if (f == NULL) { - printf ("%Zd: cannot fdopen temporary file: %m\n", __LINE__); + printf ("%u: cannot fdopen temporary file: %m\n", __LINE__); exit (1); } @@ -51,26 +51,26 @@ int main (void) f = fopen (name, "r"); if (f == NULL) { - printf ("%Zd: cannot fopen temporary file: %m\n", __LINE__); + printf ("%u: cannot fopen temporary file: %m\n", __LINE__); exit (1); } if (setvbuf (f, buf, _IOFBF, sizeof buf)) { - printf ("%Zd: setvbuf failed: %m\n", __LINE__); + printf ("%u: setvbuf failed: %m\n", __LINE__); exit (1); } if (fread (temp, 1, strlen (test), f) != strlen (test)) { - printf ("%Zd: couldn't read the file back: %m\n", __LINE__); + printf ("%u: couldn't read the file back: %m\n", __LINE__); exit (1); } temp [strlen (test)] = '\0'; if (strcmp (test, temp)) { - printf ("%Zd: read different string than was written:\n%s%s", + printf ("%u: read different string than was written:\n%s%s", __LINE__, test, temp); exit (1); } diff --git a/libio/tst-mmap2-eofsync.c b/libio/tst-mmap2-eofsync.c index 4275d4ac51..aefe472564 100644 --- a/libio/tst-mmap2-eofsync.c +++ b/libio/tst-mmap2-eofsync.c @@ -82,7 +82,7 @@ do_test (void) printf ("wrote more to file\n"); else { - printf ("wrote %d != %d (%m)\n", c, pagesize); + printf ("wrote %d != %zd (%m)\n", c, pagesize); result = 1; } diff --git a/libio/tst-widetext.c b/libio/tst-widetext.c index 7a98f641be..ed196317a9 100644 --- a/libio/tst-widetext.c +++ b/libio/tst-widetext.c @@ -56,7 +56,7 @@ main (void) mbsize = fread (mbbuf, 1, SIZE, stdin); if (mbsize == 0) { - printf ("%Zd: cannot read input file from standard input: %m\n", + printf ("%u: cannot read input file from standard input: %m\n", __LINE__); exit (1); } @@ -75,7 +75,7 @@ main (void) cd = iconv_open ("WCHAR_T", "UTF-8"); if (cd == (iconv_t) -1) { - printf ("%Zd: cannot get iconv descriptor for conversion to UCS4\n", + printf ("%u: cannot get iconv descriptor for conversion to UCS4\n", __LINE__); exit (1); } @@ -84,7 +84,7 @@ main (void) nonr = iconv (cd, &inbuf, &inleft, &outbuf, &outleft); if (nonr != 0 && nonr != (size_t) -1) { - printf ("%Zd: iconv performed %Zd nonreversible conversions\n", + printf ("%u: iconv performed %Zd nonreversible conversions\n", __LINE__, nonr); exit (1); } @@ -92,14 +92,14 @@ main (void) if ((size_t) nonr == -1 ) { printf ("\ -%Zd: iconv returned with %Zd and errno = %m (inleft: %Zd, outleft: %Zd)\n", +%u: iconv returned with %Zd and errno = %m (inleft: %Zd, outleft: %Zd)\n", __LINE__, nonr, inleft, outleft); exit (1); } if (inleft != 0) { - printf ("%Zd: iconv didn't convert all input\n", __LINE__); + printf ("%u: iconv didn't convert all input\n", __LINE__); exit (1); } @@ -107,7 +107,7 @@ main (void) if ((sizeof (wcbuf) - outleft) % sizeof (wchar_t) != 0) { - printf ("%Zd: iconv converted not complete wchar_t\n", __LINE__); + printf ("%u: iconv converted not complete wchar_t\n", __LINE__); exit (1); } @@ -122,7 +122,7 @@ main (void) fd = mkstemp (name); if (fd == -1) { - printf ("%Zd: cannot open temporary file: %m\n", __LINE__); + printf ("%u: cannot open temporary file: %m\n", __LINE__); exit (1); } @@ -131,7 +131,7 @@ main (void) fp = fdopen (dup (fd), "w"); if (fp == NULL) { - printf ("%Zd: fdopen of temp file for writing failed: %m\n", __LINE__); + printf ("%u: fdopen of temp file for writing failed: %m\n", __LINE__); exit (1); } @@ -139,7 +139,7 @@ main (void) { if (fputwc (wcbuf[n], fp) == WEOF) { - printf ("%Zd: fputwc failed: %m\n", __LINE__); + printf ("%u: fputwc failed: %m\n", __LINE__); exit (1); } } @@ -147,7 +147,7 @@ main (void) res = fclose (fp); if (res != 0) { - printf ("%Zd: fclose after single-character writing failed (%d): %m\n", + printf ("%u: fclose after single-character writing failed (%d): %m\n", __LINE__, res); exit (1); } @@ -156,7 +156,7 @@ main (void) fp = fdopen (dup (fd), "r"); if (fp == NULL) { - printf ("%Zd: fdopen of temp file for reading failed: %m\n", __LINE__); + printf ("%u: fdopen of temp file for reading failed: %m\n", __LINE__); exit (1); } @@ -165,7 +165,7 @@ main (void) wint_t wch = fgetwc (fp); if (wch == WEOF) { - printf ("%Zd: fgetwc failed (idx %Zd): %m\n", __LINE__, n); + printf ("%u: fgetwc failed (idx %Zd): %m\n", __LINE__, n); exit (1); } wc2buf[n] = wch; @@ -174,19 +174,19 @@ main (void) /* There should be nothing else. */ if (fgetwc (fp) != WEOF) { - printf ("%Zd: too many characters available with fgetwc\n", __LINE__); + printf ("%u: too many characters available with fgetwc\n", __LINE__); status = 1; } else if (wmemcmp (wcbuf, wc2buf, wcsize) != 0) { - printf ("%Zd: buffer read with fgetwc differs\n", __LINE__); + printf ("%u: buffer read with fgetwc differs\n", __LINE__); status = 1; } res = fclose (fp); if (res != 0) { - printf ("%Zd: fclose after single-character reading failed (%d): %m\n", + printf ("%u: fclose after single-character reading failed (%d): %m\n", __LINE__, res); exit (1); } @@ -198,13 +198,13 @@ main (void) fp = fdopen (fd, "r"); if (fp == NULL) { - printf ("%Zd: fdopen of temp file for reading failed: %m\n", __LINE__); + printf ("%u: fdopen of temp file for reading failed: %m\n", __LINE__); exit (1); } if (fread (mb2buf, 1, mbsize, fp) != mbsize) { - printf ("%Zd: cannot read all of the temp file\n", __LINE__); + printf ("%u: cannot read all of the temp file\n", __LINE__); status = 1; } else @@ -212,13 +212,13 @@ main (void) /* Make sure there is nothing left. */ if (fgetc (fp) != EOF) { - printf ("%Zd: more input available\n", __LINE__); + printf ("%u: more input available\n", __LINE__); status = 1; } if (memcmp (mb2buf, mbbuf, mbsize) != 0) { - printf ("%Zd: buffer written with fputwc differs\n", __LINE__); + printf ("%u: buffer written with fputwc differs\n", __LINE__); status = 1; } } @@ -226,7 +226,7 @@ main (void) res = fclose (fp); if (res != 0) { - printf ("%Zd: fclose after single-character reading failed (%d): %m\n", + printf ("%u: fclose after single-character reading failed (%d): %m\n", __LINE__, res); exit (1); } @@ -236,7 +236,7 @@ main (void) fd = mkstemp (strcpy (name, "/tmp/widetext.out.XXXXXX")); if (fd == -1) { - printf ("%Zd: cannot open temporary file: %m\n", __LINE__); + printf ("%u: cannot open temporary file: %m\n", __LINE__); exit (1); } @@ -245,7 +245,7 @@ main (void) fp = fdopen (dup (fd), "w"); if (fp == NULL) { - printf ("%Zd: fdopen of temp file for writing failed: %m\n", __LINE__); + printf ("%u: fdopen of temp file for writing failed: %m\n", __LINE__); exit (1); } @@ -275,7 +275,7 @@ main (void) res = fclose (fp); if (res != 0) { - printf ("%Zd: fclose after line-wise writing failed (%d): %m\n", + printf ("%u: fclose after line-wise writing failed (%d): %m\n", __LINE__, res); exit (1); } @@ -284,7 +284,7 @@ main (void) fp = fdopen (dup (fd), "r"); if (fp == NULL) { - printf ("%Zd: fdopen of temp file for reading failed: %m\n", __LINE__); + printf ("%u: fdopen of temp file for reading failed: %m\n", __LINE__); exit (1); } @@ -292,7 +292,7 @@ main (void) { if (fgetws (wcp, &wc2buf[wcsize] - wcp + 1, fp) == NULL) { - printf ("%Zd: short read using fgetws (only %Zd of %Zd)\n", + printf ("%u: short read using fgetws (only %Zd of %Zd)\n", __LINE__, wcp - wc2buf, wcsize); status = 1; break; @@ -302,26 +302,26 @@ main (void) if (wcp > &wc2buf[wcsize]) { - printf ("%Zd: fgetws read too much\n", __LINE__); + printf ("%u: fgetws read too much\n", __LINE__); status = 1; } else if (fgetwc (fp) != WEOF) { /* There should be nothing else. */ - printf ("%Zd: too many characters available with fgetws\n", __LINE__); + printf ("%u: too many characters available with fgetws\n", __LINE__); status = 1; } if (wcp >= &wc2buf[wcsize] && wmemcmp (wcbuf, wc2buf, wcsize) != 0) { - printf ("%Zd: buffer read with fgetws differs\n", __LINE__); + printf ("%u: buffer read with fgetws differs\n", __LINE__); status = 1; } res = fclose (fp); if (res != 0) { - printf ("%Zd: fclose after single-character reading failed (%d): %m\n", + printf ("%u: fclose after single-character reading failed (%d): %m\n", __LINE__, res); exit (1); } @@ -333,13 +333,13 @@ main (void) fp = fdopen (fd, "r"); if (fp == NULL) { - printf ("%Zd: fdopen of temp file for reading failed: %m\n", __LINE__); + printf ("%u: fdopen of temp file for reading failed: %m\n", __LINE__); exit (1); } if (fread (mb2buf, 1, mbsize, fp) != mbsize) { - printf ("%Zd: cannot read all of the temp file\n", __LINE__); + printf ("%u: cannot read all of the temp file\n", __LINE__); status = 1; } else @@ -347,13 +347,13 @@ main (void) /* Make sure there is nothing left. */ if (fgetc (fp) != EOF) { - printf ("%Zd: more input available\n", __LINE__); + printf ("%u: more input available\n", __LINE__); status = 1; } if (memcmp (mb2buf, mbbuf, mbsize) != 0) { - printf ("%Zd: buffer written with fputws differs\n", __LINE__); + printf ("%u: buffer written with fputws differs\n", __LINE__); status = 1; } } @@ -361,7 +361,7 @@ main (void) res = fclose (fp); if (res != 0) { - printf ("%Zd: fclose after single-character reading failed (%d): %m\n", + printf ("%u: fclose after single-character reading failed (%d): %m\n", __LINE__, res); exit (1); } diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 814dba02b3..b792a2fa85 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,7 @@ +2002-08-25 Ulrich Drepper <drepper@redhat.com> + + * Examples/ex9.c (thread): Remove incorrect return statement. + 2002-08-23 Ulrich Drepper <drepper@redhat.com> * pthread.c (__linuxthreads_version): New global constant. diff --git a/linuxthreads/Examples/ex17.c b/linuxthreads/Examples/ex17.c index a3ab909990..1bc09a5bda 100644 --- a/linuxthreads/Examples/ex17.c +++ b/linuxthreads/Examples/ex17.c @@ -53,7 +53,7 @@ main (void) if (stack2 != stack || stacksize != STACKSIZE) { - printf ("first pthread_attr_getstack returned different stack (%p,%x)\n" + printf ("first pthread_attr_getstack returned different stack (%p,%zx)\n" "than was set by setstack (%p,%x)\n", stack2, stacksize, stack, STACKSIZE); return 2; @@ -89,7 +89,7 @@ main (void) if (stack2 != stack || stacksize != STACKSIZE) { - printf ("second pthread_attr_getstack returned different stack (%p,%x)\n" + printf ("second pthread_attr_getstack returned different stack (%p,%zx)\n" "than was set by setstack (%p,%x)\n", stack2, stacksize, stack, STACKSIZE); return 3; diff --git a/linuxthreads/Examples/ex9.c b/linuxthreads/Examples/ex9.c index e2421a5c41..1e844a7e07 100644 --- a/linuxthreads/Examples/ex9.c +++ b/linuxthreads/Examples/ex9.c @@ -1,5 +1,5 @@ /* Tests for pthread_barrier_* functions. - Copyright (C) 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. Contributed by Kaz Kylheku <kaz@ashi.footprints.net>, 2000. The GNU C Library is free software; you can redistribute it and/or @@ -32,7 +32,7 @@ static pthread_barrier_t barrier; int main (void) { - pthread_t thread_list[NUM_THREADS]; + pthread_t thread_list[NUM_THREADS]; int i; if (pthread_barrier_init (&barrier, NULL, NUM_THREADS + 1) != 0) @@ -69,13 +69,13 @@ thread (void *arg) { case 0: flockfile (stdout); - printf ("%04d: non-serial thread %lu\n", ++linecount, + printf ("%04d: non-serial thread %lu\n", ++linecount, (unsigned long) self); funlockfile (stdout); break; case PTHREAD_BARRIER_SERIAL_THREAD: flockfile (stdout); - printf ("%04d: serial thread %lu\n", ++linecount, + printf ("%04d: serial thread %lu\n", ++linecount, (unsigned long) self); funlockfile (stdout); last_serial_thread = self; @@ -89,10 +89,9 @@ thread (void *arg) if (pthread_equal (self, last_serial_thread)) { flockfile (stdout); - printf ("%04d: last serial thread %lu terminating process\n", + printf ("%04d: last serial thread %lu terminating process\n", ++linecount, (unsigned long) self); funlockfile (stdout); - return; } pthread_exit(NULL); diff --git a/linuxthreads/tst-context.c b/linuxthreads/tst-context.c index 9066e837e2..5c3272a4fb 100644 --- a/linuxthreads/tst-context.c +++ b/linuxthreads/tst-context.c @@ -98,7 +98,7 @@ main (void) } for (n = 0; n < N; ++n) - if (pthread_create (&th[n], NULL, threadfct, (void *) n) != 0) + if (pthread_create (&th[n], NULL, threadfct, (void *) (long int) n) != 0) error (EXIT_FAILURE, errno, "cannot create all threads"); for (n = 0; n < N; ++n) diff --git a/localedata/tests-mbwc/tst_mbrlen.c b/localedata/tests-mbwc/tst_mbrlen.c index 5b31d32149..b8681b7215 100644 --- a/localedata/tests-mbwc/tst_mbrlen.c +++ b/localedata/tests-mbwc/tst_mbrlen.c @@ -66,7 +66,7 @@ tst_mbrlen (FILE * fp, int debug_flg) if (debug_flg) { - fprintf (stdout, "mbrlen() [ %s : %d : %d ] ret = %d\n", + fprintf (stdout, "mbrlen() [ %s : %d : %d ] ret = %zd\n", locale, rec + 1, seq_num + 1, ret); fprintf (stdout, " errno = %d\n", errno_save); } diff --git a/localedata/tests-mbwc/tst_mbrtowc.c b/localedata/tests-mbwc/tst_mbrtowc.c index 8b8c07f947..3a6070a870 100644 --- a/localedata/tests-mbwc/tst_mbrtowc.c +++ b/localedata/tests-mbwc/tst_mbrtowc.c @@ -68,7 +68,7 @@ tst_mbrtowc (FILE * fp, int debug_flg) if (debug_flg) { - fprintf (stdout, "mbrtowc() [ %s : %d : %d ] ret = %d\n", + fprintf (stdout, "mbrtowc() [ %s : %d : %d ] ret = %zd\n", locale, rec + 1, seq_num + 1, ret); fprintf (stdout, " errno = %hd\n", errno_save); diff --git a/localedata/tests-mbwc/tst_mbsrtowcs.c b/localedata/tests-mbwc/tst_mbsrtowcs.c index f9faeee196..3f3ea716b4 100644 --- a/localedata/tests-mbwc/tst_mbsrtowcs.c +++ b/localedata/tests-mbwc/tst_mbsrtowcs.c @@ -63,7 +63,7 @@ tst_mbsrtowcs (FILE * fp, int debug_flg) if (debug_flg) { - fprintf (stderr, "mbsrtowcs: [ %d ] : ret = %d\n", rec + 1, ret); + fprintf (stderr, "mbsrtowcs: [ %d ] : ret = %zd\n", rec + 1, ret); } TST_IF_RETURN (S_MBSRTOWCS) @@ -82,7 +82,8 @@ tst_mbsrtowcs (FILE * fp, int debug_flg) { fprintf (stderr, "mbsrtowcs: ws[%d] => 0x%lx : 0x%lx <= ws_ex[%d]\n", - i, ws[i], ws_ex[i], i); + i, (unsigned long int) ws[i], + (unsigned long int) ws_ex[i], i); } if (ws[i] != ws_ex[i]) diff --git a/localedata/tests-mbwc/tst_mbstowcs.c b/localedata/tests-mbwc/tst_mbstowcs.c index 56928bd7dd..878df6a960 100644 --- a/localedata/tests-mbwc/tst_mbstowcs.c +++ b/localedata/tests-mbwc/tst_mbstowcs.c @@ -51,7 +51,7 @@ tst_mbstowcs (FILE * fp, int debug_flg) if (debug_flg) { - fprintf (stderr, "mbstowcs: ret = %d\n", ret); + fprintf (stderr, "mbstowcs: ret = %zd\n", ret); } TST_IF_RETURN (S_MBSTOWCS) @@ -71,7 +71,8 @@ tst_mbstowcs (FILE * fp, int debug_flg) { fprintf (stderr, "mbstowcs: ws[%d] => 0x%lx : 0x%lx <= ws_ex[%d]\n", - i, ws[i], ws_ex[i], i); + i, (unsigned long int) ws[i], + (unsigned long int) ws_ex[i], i); } if (ws[i] != ws_ex[i]) diff --git a/localedata/tests-mbwc/tst_strfmon.c b/localedata/tests-mbwc/tst_strfmon.c index b6c13a3a5e..88e93167df 100644 --- a/localedata/tests-mbwc/tst_strfmon.c +++ b/localedata/tests-mbwc/tst_strfmon.c @@ -43,7 +43,7 @@ tst_strfmon (FILE * fp, int debug_flg) fprintf (stdout, "strfmon() [ %s : %d ]\n", locale, rec + 1); fprintf (stdout, " : err = %d | %s\n", errno_save, strerror (errno)); - fprintf (stdout, " : ret = %d; \t fmt = |%s|\n", ret, fmt); + fprintf (stdout, " : ret = %zd; \t fmt = |%s|\n", ret, fmt); fprintf (stdout, " : buf = |%s|\n\n", buf); } diff --git a/localedata/tests-mbwc/tst_strxfrm.c b/localedata/tests-mbwc/tst_strxfrm.c index 0a3789399c..fdfeffc892 100644 --- a/localedata/tests-mbwc/tst_strxfrm.c +++ b/localedata/tests-mbwc/tst_strxfrm.c @@ -54,7 +54,7 @@ tst_strxfrm (FILE * fp, int debug_flg) rec + 1); fprintf (stdout, " : err = %d | %s\n", errno_save, strerror (errno)); - fprintf (stdout, " : ret = %u\n", ret); + fprintf (stdout, " : ret = %zu\n", ret); fprintf (stdout, " : org = %s\n", org1); } @@ -77,7 +77,7 @@ tst_strxfrm (FILE * fp, int debug_flg) fprintf (stderr, " ..............( 2nd call )\n"); fprintf (stdout, " : err = %d | %s\n", errno, strerror (errno)); - fprintf (stdout, " : ret = %u\n", ret); + fprintf (stdout, " : ret = %zu\n", ret); fprintf (stdout, " : org = %s\n", org2); } diff --git a/localedata/tests-mbwc/tst_swscanf.c b/localedata/tests-mbwc/tst_swscanf.c index 8819a0ef94..76445d75f4 100644 --- a/localedata/tests-mbwc/tst_swscanf.c +++ b/localedata/tests-mbwc/tst_swscanf.c @@ -60,7 +60,7 @@ tst_swscanf (FILE * fp, int debug_flg) if (TST_INPUT (swscanf).wch) { fprintf (stdout, " val_S[ 0 ] = 0x%lx\n", - val_S[0]); + (unsigned long int) val_S[0]); } else { diff --git a/localedata/tests-mbwc/tst_wcscat.c b/localedata/tests-mbwc/tst_wcscat.c index 7012a66218..3dc98091c2 100644 --- a/localedata/tests-mbwc/tst_wcscat.c +++ b/localedata/tests-mbwc/tst_wcscat.c @@ -52,7 +52,7 @@ tst_wcscat (FILE * fp, int debug_flg) if (debug_flg) { fprintf (stdout, "tst_wcscat() : ws1[%d] = 0x%lx\n", i, - ws1[i]); + (unsigned long int) ws1[i]); } if (ws1[i] != ws_ex[i]) diff --git a/localedata/tests-mbwc/tst_wcschr.c b/localedata/tests-mbwc/tst_wcschr.c index 118baba304..b57a05a8f9 100644 --- a/localedata/tests-mbwc/tst_wcschr.c +++ b/localedata/tests-mbwc/tst_wcschr.c @@ -27,7 +27,8 @@ tst_wcschr (FILE * fp, int debug_flg) { if (ret) { - fprintf (stderr, "wcschr: ret = 0x%lx\n", *ret); + fprintf (stderr, "wcschr: ret = 0x%lx\n", + (unsigned long int) *ret); } else { diff --git a/localedata/tests-mbwc/tst_wcscpy.c b/localedata/tests-mbwc/tst_wcscpy.c index 3dc6406a38..d5705a55dc 100644 --- a/localedata/tests-mbwc/tst_wcscpy.c +++ b/localedata/tests-mbwc/tst_wcscpy.c @@ -47,7 +47,8 @@ tst_wcscpy (FILE * fp, int debug_flg) { fprintf (stderr, "ws1[ %d ] = 0x%lx <-> wx_ex[ %d ] = 0x%lx\n", i, - ws1[i], i, ws_ex[i]); + (unsigned long int) ws1[i], i, + (unsigned long int) ws_ex[i]); } if (ws1[i] != ws_ex[i]) diff --git a/localedata/tests-mbwc/tst_wcscspn.c b/localedata/tests-mbwc/tst_wcscspn.c index 5b55ac199f..e1c8892fee 100644 --- a/localedata/tests-mbwc/tst_wcscspn.c +++ b/localedata/tests-mbwc/tst_wcscspn.c @@ -25,7 +25,7 @@ tst_wcscspn (FILE * fp, int debug_flg) if (debug_flg) { - fprintf (stderr, "wcscspn: ret = %d\n", ret); + fprintf (stderr, "wcscspn: ret = %zu\n", ret); } TST_IF_RETURN (S_WCSCSPN) diff --git a/localedata/tests-mbwc/tst_wcsncat.c b/localedata/tests-mbwc/tst_wcsncat.c index 4665f72ced..a2f6ba020b 100644 --- a/localedata/tests-mbwc/tst_wcsncat.c +++ b/localedata/tests-mbwc/tst_wcsncat.c @@ -48,7 +48,8 @@ tst_wcsncat (FILE * fp, int debug_flg) { if (debug_flg) { - fprintf (stderr, "ws1[%d] = 0x%lx\n", i, ws1[i]); + fprintf (stderr, "ws1[%d] = 0x%lx\n", i, + (unsigned long int) ws1[i]); } if (ws1[i] != ws_ex[i]) diff --git a/localedata/tests-mbwc/tst_wcsncpy.c b/localedata/tests-mbwc/tst_wcsncpy.c index f2127d4a7d..814bbc0a8b 100644 --- a/localedata/tests-mbwc/tst_wcsncpy.c +++ b/localedata/tests-mbwc/tst_wcsncpy.c @@ -54,7 +54,7 @@ tst_wcsncpy (FILE *fp, int debug_flg) { if (debug_flg) { - fprintf (stderr, "\nwcsncpy: n = %d\n\n", n); + fprintf (stderr, "\nwcsncpy: n = %zu\n\n", n); } ws_ex = TST_EXPECT (wcsncpy).ws; @@ -64,7 +64,8 @@ tst_wcsncpy (FILE *fp, int debug_flg) if (debug_flg) fprintf (stderr, "wcsncpy: ws1[ %d ] = 0x%lx <-> wx_ex[ %d ] = 0x%lx\n", - i, ws1[i], i, ws_ex[i]); + i, (unsigned long int) ws1[i], i, + (unsigned long int) ws_ex[i]); if (ws1[i] != ws_ex[i]) { diff --git a/localedata/tests-mbwc/tst_wcspbrk.c b/localedata/tests-mbwc/tst_wcspbrk.c index 405c12531e..95c1c0fa69 100644 --- a/localedata/tests-mbwc/tst_wcspbrk.c +++ b/localedata/tests-mbwc/tst_wcspbrk.c @@ -33,7 +33,7 @@ tst_wcspbrk (FILE * fp, int debug_flg) if (ret) fprintf (stderr, " ret[0] = 0x%lx : 0x%lx = ws2[0]\n", - ret[0], ws2[0]); + (unsigned long int) ret[0], (unsigned long int) ws2[0]); } TST_IF_RETURN (S_WCSPBRK) @@ -59,7 +59,7 @@ tst_wcspbrk (FILE * fp, int debug_flg) if (debug_flg) fprintf (stdout, " *ret = 0x%lx <-> 0x%lx = wc_ex\n", - *ret, wc_ex); + (unsigned long int) *ret, (unsigned long int) wc_ex); if (*ret != wc_ex) { diff --git a/localedata/tests-mbwc/tst_wcsrtombs.c b/localedata/tests-mbwc/tst_wcsrtombs.c index 02a69a0fcc..3a8edccada 100644 --- a/localedata/tests-mbwc/tst_wcsrtombs.c +++ b/localedata/tests-mbwc/tst_wcsrtombs.c @@ -50,7 +50,7 @@ tst_wcsrtombs (FILE * fp, int debug_flg) if (debug_flg) { - fprintf (stderr, "wcsrtombs: ret = %d\n", ret); + fprintf (stderr, "wcsrtombs: ret = %zu\n", ret); } TST_IF_RETURN (S_WCSRTOMBS) diff --git a/localedata/tests-mbwc/tst_wcsspn.c b/localedata/tests-mbwc/tst_wcsspn.c index c80b8e8c05..02157eecaa 100644 --- a/localedata/tests-mbwc/tst_wcsspn.c +++ b/localedata/tests-mbwc/tst_wcsspn.c @@ -25,7 +25,7 @@ tst_wcsspn (FILE *fp, int debug_flg) if (debug_flg) { - fprintf (stderr, "wcsspn: ret = %d\n", ret); + fprintf (stderr, "wcsspn: ret = %zu\n", ret); } TST_IF_RETURN (S_WCSSPN) diff --git a/localedata/tests-mbwc/tst_wcsstr.c b/localedata/tests-mbwc/tst_wcsstr.c index 20ebecfafc..f8b00c4b75 100644 --- a/localedata/tests-mbwc/tst_wcsstr.c +++ b/localedata/tests-mbwc/tst_wcsstr.c @@ -32,7 +32,7 @@ tst_wcsstr (FILE * fp, int debug_flg) { fprintf (stderr, " ret[ 0 ] = 0x%lx <-> 0x%lx = ws2[ 0 ]\n", - ret[0], ws2[0]); + (unsigned long int) ret[0], (unsigned long int) ws2[0]); } } @@ -60,7 +60,8 @@ tst_wcsstr (FILE * fp, int debug_flg) { fprintf (stderr, " : ret[ %d ] = 0x%lx <-> 0x%lx = ws2[ %d ]\n", - i, ret[i], ws2[i], i); + i, (unsigned long int) ret[i], + (unsigned long int) ws2[i], i); } if (ret[i] != ws2[i]) diff --git a/localedata/tests-mbwc/tst_wcstod.c b/localedata/tests-mbwc/tst_wcstod.c index 5ee151bd54..1648d35397 100644 --- a/localedata/tests-mbwc/tst_wcstod.c +++ b/localedata/tests-mbwc/tst_wcstod.c @@ -30,7 +30,8 @@ tst_wcstod (FILE * fp, int debug_flg) { fprintf (stdout, "wcstod() [ %s : %d ] ret = %f\n", locale, rec + 1, ret); - fprintf (stdout, " *endp = 0x%lx\n", *endp); + fprintf (stdout, " *endp = 0x%lx\n", + (unsigned long int) *endp); } TST_IF_RETURN (S_WCSTOD) diff --git a/localedata/tests-mbwc/tst_wcstok.c b/localedata/tests-mbwc/tst_wcstok.c index 3b80a61011..1222b97855 100644 --- a/localedata/tests-mbwc/tst_wcstok.c +++ b/localedata/tests-mbwc/tst_wcstok.c @@ -35,11 +35,11 @@ tst_wcstok (FILE * fp, int debug_flg) if (debug_flg) { fprintf (stdout, "wcstok() [ %s : %d : %d ] *ret = 0x%lx\n", - locale, rec + 1, seq_num + 1, *ret); + locale, rec + 1, seq_num + 1, (unsigned long int) *ret); if (pt && *pt) { fprintf (stdout, " *pt = 0x%lx\n", - *pt); + (unsigned long int) *pt); } } @@ -63,7 +63,9 @@ tst_wcstok (FILE * fp, int debug_flg) { fprintf (stderr, " ret[%d] = 0x%lx <-> " - "0x%lx = ws_ex[%d]\n", i, ret[i], ws_ex[i], i); + "0x%lx = ws_ex[%d]\n", + i, (unsigned long int) ret[i], + (unsigned long int) ws_ex[i], i); } if (ret[i] != ws_ex[i]) diff --git a/localedata/tests-mbwc/tst_wcstombs.c b/localedata/tests-mbwc/tst_wcstombs.c index 64a327dadc..c0851a4305 100644 --- a/localedata/tests-mbwc/tst_wcstombs.c +++ b/localedata/tests-mbwc/tst_wcstombs.c @@ -38,7 +38,7 @@ tst_wcstombs (FILE * fp, int debug_flg) if (debug_flg) { - fprintf (stdout, "wcstombs: ret = %d\n", ret); + fprintf (stdout, "wcstombs: ret = %zu\n", ret); } TST_IF_RETURN (S_WCSTOMBS) |