AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-24 22:10:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
* 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.
This commit is contained in:
Ulrich Drepper 2002-08-25 08:44:43 +00:00
parent 5a47e7f2a8
commit 6d497bbef7
31 changed files with 111 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,5 +1,14 @@
2002-08-25 Ulrich Drepper <drepper@redhat.com> 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 * sysdeps/i386/elf/configure.in: Unconditionally define
PI_STATIC_AND_HIDDEN. PI_STATIC_AND_HIDDEN.
* elf/rtld.c (DONT_USE_BOOTSTRAP_MAP): Define only if * elf/rtld.c (DONT_USE_BOOTSTRAP_MAP): Define only if

18
libio/tst-freopen.c
View File

@ -34,14 +34,14 @@ main (void)
if (fd == -1) if (fd == -1)
{ {
printf ("%Zd: cannot open temporary file: %m\n", __LINE__); printf ("%u: cannot open temporary file: %m\n", __LINE__);
exit (1); exit (1);
} }
f = fdopen (fd, "w"); f = fdopen (fd, "w");
if (f == NULL) if (f == NULL)
{ {
printf ("%Zd: cannot fdopen temporary file: %m\n", __LINE__); printf ("%u: cannot fdopen temporary file: %m\n", __LINE__);
exit (1); exit (1);
} }
@ -51,20 +51,20 @@ main (void)
f = fopen (name, "r"); f = fopen (name, "r");
if (f == NULL) if (f == NULL)
{ {
printf ("%Zd: cannot fopen temporary file: %m\n", __LINE__); printf ("%u: cannot fopen temporary file: %m\n", __LINE__);
exit (1); exit (1);
} }
if (fread (temp, 1, strlen (test), f) != strlen (test)) 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); exit (1);
} }
temp [strlen (test)] = '\0'; temp [strlen (test)] = '\0';
if (strcmp (test, temp)) 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); __LINE__, test, temp);
exit (1); exit (1);
} }
@ -72,26 +72,26 @@ main (void)
f = freopen (name, "r+", f); f = freopen (name, "r+", f);
if (f == NULL) if (f == NULL)
{ {
printf ("%Zd: cannot freopen temporary file: %m\n", __LINE__); printf ("%u: cannot freopen temporary file: %m\n", __LINE__);
exit (1); exit (1);
} }
if (fseek (f, 0, SEEK_SET) != 0) 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); exit (1);
} }
if (fread (temp, 1, strlen (test), f) != strlen (test)) 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); exit (1);
} }
temp [strlen (test)] = '\0'; temp [strlen (test)] = '\0';
if (strcmp (test, temp)) 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); __LINE__, test, temp);
exit (1); exit (1);
} }

2
libio/tst-mmap-eofsync.c
View File

@ -78,7 +78,7 @@ do_test (void)
printf ("wrote more to file\n"); printf ("wrote more to file\n");
else else
{ {
printf ("wrote %d != %d (%m)\n", c, sizeof text2 - 1); printf ("wrote %d != %zd (%m)\n", c, sizeof text2 - 1);
result = 1; result = 1;
} }

2
libio/tst-mmap-fflushsync.c
View File

@ -71,7 +71,7 @@ do_test (void)
printf ("wrote more to file\n"); printf ("wrote more to file\n");
else else
{ {
printf ("wrote %d != %d (%m)\n", c, sizeof text2 - 1); printf ("wrote %d != %zd (%m)\n", c, sizeof text2 - 1);
result = 1; result = 1;
} }

12
libio/tst-mmap-setvbuf.c
View File

@ -34,14 +34,14 @@ int main (void)
if (fd == -1) if (fd == -1)
{ {
printf ("%Zd: cannot open temporary file: %m\n", __LINE__); printf ("%u: cannot open temporary file: %m\n", __LINE__);
exit (1); exit (1);
} }
f = fdopen (fd, "w"); f = fdopen (fd, "w");
if (f == NULL) if (f == NULL)
{ {
printf ("%Zd: cannot fdopen temporary file: %m\n", __LINE__); printf ("%u: cannot fdopen temporary file: %m\n", __LINE__);
exit (1); exit (1);
} }
@ -51,26 +51,26 @@ int main (void)
f = fopen (name, "r"); f = fopen (name, "r");
if (f == NULL) if (f == NULL)
{ {
printf ("%Zd: cannot fopen temporary file: %m\n", __LINE__); printf ("%u: cannot fopen temporary file: %m\n", __LINE__);
exit (1); exit (1);
} }
if (setvbuf (f, buf, _IOFBF, sizeof buf)) if (setvbuf (f, buf, _IOFBF, sizeof buf))
{ {
printf ("%Zd: setvbuf failed: %m\n", __LINE__); printf ("%u: setvbuf failed: %m\n", __LINE__);
exit (1); exit (1);
} }
if (fread (temp, 1, strlen (test), f) != strlen (test)) 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); exit (1);
} }
temp [strlen (test)] = '\0'; temp [strlen (test)] = '\0';
if (strcmp (test, temp)) 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); __LINE__, test, temp);
exit (1); exit (1);
} }

2
libio/tst-mmap2-eofsync.c
View File

@ -82,7 +82,7 @@ do_test (void)
printf ("wrote more to file\n"); printf ("wrote more to file\n");
else else
{ {
printf ("wrote %d != %d (%m)\n", c, pagesize); printf ("wrote %d != %zd (%m)\n", c, pagesize);
result = 1; result = 1;
} }

68
libio/tst-widetext.c
View File

@ -56,7 +56,7 @@ main (void)
mbsize = fread (mbbuf, 1, SIZE, stdin); mbsize = fread (mbbuf, 1, SIZE, stdin);
if (mbsize == 0) 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__); __LINE__);
exit (1); exit (1);
} }
@ -75,7 +75,7 @@ main (void)
cd = iconv_open ("WCHAR_T", "UTF-8"); cd = iconv_open ("WCHAR_T", "UTF-8");
if (cd == (iconv_t) -1) 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__); __LINE__);
exit (1); exit (1);
} }
@ -84,7 +84,7 @@ main (void)
nonr = iconv (cd, &inbuf, &inleft, &outbuf, &outleft); nonr = iconv (cd, &inbuf, &inleft, &outbuf, &outleft);
if (nonr != 0 && nonr != (size_t) -1) 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); __LINE__, nonr);
exit (1); exit (1);
} }
@ -92,14 +92,14 @@ main (void)
if ((size_t) nonr == -1 ) if ((size_t) nonr == -1 )
{ {
printf ("\ 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); __LINE__, nonr, inleft, outleft);
exit (1); exit (1);
} }
if (inleft != 0) 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); exit (1);
} }
@ -107,7 +107,7 @@ main (void)
if ((sizeof (wcbuf) - outleft) % sizeof (wchar_t) != 0) 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); exit (1);
} }
@ -122,7 +122,7 @@ main (void)
fd = mkstemp (name); fd = mkstemp (name);
if (fd == -1) if (fd == -1)
{ {
printf ("%Zd: cannot open temporary file: %m\n", __LINE__); printf ("%u: cannot open temporary file: %m\n", __LINE__);
exit (1); exit (1);
} }
@ -131,7 +131,7 @@ main (void)
fp = fdopen (dup (fd), "w"); fp = fdopen (dup (fd), "w");
if (fp == NULL) 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); exit (1);
} }
@ -139,7 +139,7 @@ main (void)
{ {
if (fputwc (wcbuf[n], fp) == WEOF) if (fputwc (wcbuf[n], fp) == WEOF)
{ {
printf ("%Zd: fputwc failed: %m\n", __LINE__); printf ("%u: fputwc failed: %m\n", __LINE__);
exit (1); exit (1);
} }
} }
@ -147,7 +147,7 @@ main (void)
res = fclose (fp); res = fclose (fp);
if (res != 0) 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); __LINE__, res);
exit (1); exit (1);
} }
@ -156,7 +156,7 @@ main (void)
fp = fdopen (dup (fd), "r"); fp = fdopen (dup (fd), "r");
if (fp == NULL) 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); exit (1);
} }
@ -165,7 +165,7 @@ main (void)
wint_t wch = fgetwc (fp); wint_t wch = fgetwc (fp);
if (wch == WEOF) 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); exit (1);
} }
wc2buf[n] = wch; wc2buf[n] = wch;
@ -174,19 +174,19 @@ main (void)
/* There should be nothing else. */ /* There should be nothing else. */
if (fgetwc (fp) != WEOF) 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; status = 1;
} }
else if (wmemcmp (wcbuf, wc2buf, wcsize) != 0) 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; status = 1;
} }
res = fclose (fp); res = fclose (fp);
if (res != 0) 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); __LINE__, res);
exit (1); exit (1);
} }
@ -198,13 +198,13 @@ main (void)
fp = fdopen (fd, "r"); fp = fdopen (fd, "r");
if (fp == NULL) 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); exit (1);
} }
if (fread (mb2buf, 1, mbsize, fp) != mbsize) 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; status = 1;
} }
else else
@ -212,13 +212,13 @@ main (void)
/* Make sure there is nothing left. */ /* Make sure there is nothing left. */
if (fgetc (fp) != EOF) if (fgetc (fp) != EOF)
{ {
printf ("%Zd: more input available\n", __LINE__); printf ("%u: more input available\n", __LINE__);
status = 1; status = 1;
} }
if (memcmp (mb2buf, mbbuf, mbsize) != 0) 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; status = 1;
} }
} }
@ -226,7 +226,7 @@ main (void)
res = fclose (fp); res = fclose (fp);
if (res != 0) 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); __LINE__, res);
exit (1); exit (1);
} }
@ -236,7 +236,7 @@ main (void)
fd = mkstemp (strcpy (name, "/tmp/widetext.out.XXXXXX")); fd = mkstemp (strcpy (name, "/tmp/widetext.out.XXXXXX"));
if (fd == -1) if (fd == -1)
{ {
printf ("%Zd: cannot open temporary file: %m\n", __LINE__); printf ("%u: cannot open temporary file: %m\n", __LINE__);
exit (1); exit (1);
} }
@ -245,7 +245,7 @@ main (void)
fp = fdopen (dup (fd), "w"); fp = fdopen (dup (fd), "w");
if (fp == NULL) 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); exit (1);
} }
@ -275,7 +275,7 @@ main (void)
res = fclose (fp); res = fclose (fp);
if (res != 0) 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); __LINE__, res);
exit (1); exit (1);
} }
@ -284,7 +284,7 @@ main (void)
fp = fdopen (dup (fd), "r"); fp = fdopen (dup (fd), "r");
if (fp == NULL) 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); exit (1);
} }
@ -292,7 +292,7 @@ main (void)
{ {
if (fgetws (wcp, &wc2buf[wcsize] - wcp + 1, fp) == NULL) 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); __LINE__, wcp - wc2buf, wcsize);
status = 1; status = 1;
break; break;
@ -302,26 +302,26 @@ main (void)
if (wcp > &wc2buf[wcsize]) if (wcp > &wc2buf[wcsize])
{ {
printf ("%Zd: fgetws read too much\n", __LINE__); printf ("%u: fgetws read too much\n", __LINE__);
status = 1; status = 1;
} }
else if (fgetwc (fp) != WEOF) else if (fgetwc (fp) != WEOF)
{ {
/* There should be nothing else. */ /* 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; status = 1;
} }
if (wcp >= &wc2buf[wcsize] && wmemcmp (wcbuf, wc2buf, wcsize) != 0) 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; status = 1;
} }
res = fclose (fp); res = fclose (fp);
if (res != 0) 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); __LINE__, res);
exit (1); exit (1);
} }
@ -333,13 +333,13 @@ main (void)
fp = fdopen (fd, "r"); fp = fdopen (fd, "r");
if (fp == NULL) 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); exit (1);
} }
if (fread (mb2buf, 1, mbsize, fp) != mbsize) 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; status = 1;
} }
else else
@ -347,13 +347,13 @@ main (void)
/* Make sure there is nothing left. */ /* Make sure there is nothing left. */
if (fgetc (fp) != EOF) if (fgetc (fp) != EOF)
{ {
printf ("%Zd: more input available\n", __LINE__); printf ("%u: more input available\n", __LINE__);
status = 1; status = 1;
} }
if (memcmp (mb2buf, mbbuf, mbsize) != 0) 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; status = 1;
} }
} }
@ -361,7 +361,7 @@ main (void)
res = fclose (fp); res = fclose (fp);
if (res != 0) 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); __LINE__, res);
exit (1); exit (1);
} }

4
linuxthreads/ChangeLog
View File

@ -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> 2002-08-23 Ulrich Drepper <drepper@redhat.com>
* pthread.c (__linuxthreads_version): New global constant. * pthread.c (__linuxthreads_version): New global constant.

4
linuxthreads/Examples/ex17.c
View File

@ -53,7 +53,7 @@ main (void)
if (stack2 != stack || stacksize != STACKSIZE) 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", "than was set by setstack (%p,%x)\n",
stack2, stacksize, stack, STACKSIZE); stack2, stacksize, stack, STACKSIZE);
return 2; return 2;
@ -89,7 +89,7 @@ main (void)
if (stack2 != stack || stacksize != STACKSIZE) 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", "than was set by setstack (%p,%x)\n",
stack2, stacksize, stack, STACKSIZE); stack2, stacksize, stack, STACKSIZE);
return 3; return 3;

3
linuxthreads/Examples/ex9.c
View File

@ -1,5 +1,5 @@
/* Tests for pthread_barrier_* functions. /* 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. Contributed by Kaz Kylheku <kaz@ashi.footprints.net>, 2000.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -92,7 +92,6 @@ thread (void *arg)
printf ("%04d: last serial thread %lu terminating process\n", printf ("%04d: last serial thread %lu terminating process\n",
++linecount, (unsigned long) self); ++linecount, (unsigned long) self);
funlockfile (stdout); funlockfile (stdout);
return;
} }
pthread_exit(NULL); pthread_exit(NULL);

2
linuxthreads/tst-context.c
View File

@ -98,7 +98,7 @@ main (void)
} }
for (n = 0; n < N; ++n) 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"); error (EXIT_FAILURE, errno, "cannot create all threads");
for (n = 0; n < N; ++n) for (n = 0; n < N; ++n)

2
localedata/tests-mbwc/tst_mbrlen.c
View File

@ -66,7 +66,7 @@ tst_mbrlen (FILE * fp, int debug_flg)
if (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); locale, rec + 1, seq_num + 1, ret);
fprintf (stdout, " errno = %d\n", errno_save); fprintf (stdout, " errno = %d\n", errno_save);
} }

2
localedata/tests-mbwc/tst_mbrtowc.c
View File

@ -68,7 +68,7 @@ tst_mbrtowc (FILE * fp, int debug_flg)
if (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); locale, rec + 1, seq_num + 1, ret);
fprintf (stdout, " errno = %hd\n", fprintf (stdout, " errno = %hd\n",
errno_save); errno_save);

5
localedata/tests-mbwc/tst_mbsrtowcs.c
View File

@ -63,7 +63,7 @@ tst_mbsrtowcs (FILE * fp, int debug_flg)
if (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) TST_IF_RETURN (S_MBSRTOWCS)
@ -82,7 +82,8 @@ tst_mbsrtowcs (FILE * fp, int debug_flg)
{ {
fprintf (stderr, fprintf (stderr,
"mbsrtowcs: ws[%d] => 0x%lx : 0x%lx <= ws_ex[%d]\n", "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]) if (ws[i] != ws_ex[i])

5
localedata/tests-mbwc/tst_mbstowcs.c
View File

@ -51,7 +51,7 @@ tst_mbstowcs (FILE * fp, int debug_flg)
if (debug_flg) if (debug_flg)
{ {
fprintf (stderr, "mbstowcs: ret = %d\n", ret); fprintf (stderr, "mbstowcs: ret = %zd\n", ret);
} }
TST_IF_RETURN (S_MBSTOWCS) TST_IF_RETURN (S_MBSTOWCS)
@ -71,7 +71,8 @@ tst_mbstowcs (FILE * fp, int debug_flg)
{ {
fprintf (stderr, fprintf (stderr,
"mbstowcs: ws[%d] => 0x%lx : 0x%lx <= ws_ex[%d]\n", "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]) if (ws[i] != ws_ex[i])

2
localedata/tests-mbwc/tst_strfmon.c
View File

@ -43,7 +43,7 @@ tst_strfmon (FILE * fp, int debug_flg)
fprintf (stdout, "strfmon() [ %s : %d ]\n", locale, rec + 1); fprintf (stdout, "strfmon() [ %s : %d ]\n", locale, rec + 1);
fprintf (stdout, " : err = %d | %s\n", errno_save, fprintf (stdout, " : err = %d | %s\n", errno_save,
strerror (errno)); 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); fprintf (stdout, " : buf = |%s|\n\n", buf);
} }

4
localedata/tests-mbwc/tst_strxfrm.c
View File

@ -54,7 +54,7 @@ tst_strxfrm (FILE * fp, int debug_flg)
rec + 1); rec + 1);
fprintf (stdout, " : err = %d | %s\n", errno_save, fprintf (stdout, " : err = %d | %s\n", errno_save,
strerror (errno)); strerror (errno));
fprintf (stdout, " : ret = %u\n", ret); fprintf (stdout, " : ret = %zu\n", ret);
fprintf (stdout, " : org = %s\n", org1); fprintf (stdout, " : org = %s\n", org1);
} }
@ -77,7 +77,7 @@ tst_strxfrm (FILE * fp, int debug_flg)
fprintf (stderr, " ..............( 2nd call )\n"); fprintf (stderr, " ..............( 2nd call )\n");
fprintf (stdout, " : err = %d | %s\n", errno, fprintf (stdout, " : err = %d | %s\n", errno,
strerror (errno)); strerror (errno));
fprintf (stdout, " : ret = %u\n", ret); fprintf (stdout, " : ret = %zu\n", ret);
fprintf (stdout, " : org = %s\n", org2); fprintf (stdout, " : org = %s\n", org2);
} }

2
localedata/tests-mbwc/tst_swscanf.c
View File

@ -60,7 +60,7 @@ tst_swscanf (FILE * fp, int debug_flg)
if (TST_INPUT (swscanf).wch) if (TST_INPUT (swscanf).wch)
{ {
fprintf (stdout, " val_S[ 0 ] = 0x%lx\n", fprintf (stdout, " val_S[ 0 ] = 0x%lx\n",
val_S[0]); (unsigned long int) val_S[0]);
} }
else else
{ {

2
localedata/tests-mbwc/tst_wcscat.c
View File

@ -52,7 +52,7 @@ tst_wcscat (FILE * fp, int debug_flg)
if (debug_flg) if (debug_flg)
{ {
fprintf (stdout, "tst_wcscat() : ws1[%d] = 0x%lx\n", i, fprintf (stdout, "tst_wcscat() : ws1[%d] = 0x%lx\n", i,
ws1[i]); (unsigned long int) ws1[i]);
} }
if (ws1[i] != ws_ex[i]) if (ws1[i] != ws_ex[i])

3
localedata/tests-mbwc/tst_wcschr.c
View File

@ -27,7 +27,8 @@ tst_wcschr (FILE * fp, int debug_flg)
{ {
if (ret) if (ret)
{ {
fprintf (stderr, "wcschr: ret = 0x%lx\n", *ret); fprintf (stderr, "wcschr: ret = 0x%lx\n",
(unsigned long int) *ret);
} }
else else
{ {

3
localedata/tests-mbwc/tst_wcscpy.c
View File

@ -47,7 +47,8 @@ tst_wcscpy (FILE * fp, int debug_flg)
{ {
fprintf (stderr, fprintf (stderr,
"ws1[ %d ] = 0x%lx <-> wx_ex[ %d ] = 0x%lx\n", i, "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]) if (ws1[i] != ws_ex[i])

2
localedata/tests-mbwc/tst_wcscspn.c
View File

@ -25,7 +25,7 @@ tst_wcscspn (FILE * fp, int debug_flg)
if (debug_flg) if (debug_flg)
{ {
fprintf (stderr, "wcscspn: ret = %d\n", ret); fprintf (stderr, "wcscspn: ret = %zu\n", ret);
} }
TST_IF_RETURN (S_WCSCSPN) TST_IF_RETURN (S_WCSCSPN)

3
localedata/tests-mbwc/tst_wcsncat.c
View File

@ -48,7 +48,8 @@ tst_wcsncat (FILE * fp, int debug_flg)
{ {
if (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]) if (ws1[i] != ws_ex[i])

5
localedata/tests-mbwc/tst_wcsncpy.c
View File

@ -54,7 +54,7 @@ tst_wcsncpy (FILE *fp, int debug_flg)
{ {
if (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; ws_ex = TST_EXPECT (wcsncpy).ws;
@ -64,7 +64,8 @@ tst_wcsncpy (FILE *fp, int debug_flg)
if (debug_flg) if (debug_flg)
fprintf (stderr, fprintf (stderr,
"wcsncpy: ws1[ %d ] = 0x%lx <-> wx_ex[ %d ] = 0x%lx\n", "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]) if (ws1[i] != ws_ex[i])
{ {

4
localedata/tests-mbwc/tst_wcspbrk.c
View File

@ -33,7 +33,7 @@ tst_wcspbrk (FILE * fp, int debug_flg)
if (ret) if (ret)
fprintf (stderr, fprintf (stderr,
" ret[0] = 0x%lx : 0x%lx = ws2[0]\n", " 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) TST_IF_RETURN (S_WCSPBRK)
@ -59,7 +59,7 @@ tst_wcspbrk (FILE * fp, int debug_flg)
if (debug_flg) if (debug_flg)
fprintf (stdout, fprintf (stdout,
" *ret = 0x%lx <-> 0x%lx = wc_ex\n", " *ret = 0x%lx <-> 0x%lx = wc_ex\n",
*ret, wc_ex); (unsigned long int) *ret, (unsigned long int) wc_ex);
if (*ret != wc_ex) if (*ret != wc_ex)
{ {

2
localedata/tests-mbwc/tst_wcsrtombs.c
View File

@ -50,7 +50,7 @@ tst_wcsrtombs (FILE * fp, int debug_flg)
if (debug_flg) if (debug_flg)
{ {
fprintf (stderr, "wcsrtombs: ret = %d\n", ret); fprintf (stderr, "wcsrtombs: ret = %zu\n", ret);
} }
TST_IF_RETURN (S_WCSRTOMBS) TST_IF_RETURN (S_WCSRTOMBS)

2
localedata/tests-mbwc/tst_wcsspn.c
View File

@ -25,7 +25,7 @@ tst_wcsspn (FILE *fp, int debug_flg)
if (debug_flg) if (debug_flg)
{ {
fprintf (stderr, "wcsspn: ret = %d\n", ret); fprintf (stderr, "wcsspn: ret = %zu\n", ret);
} }
TST_IF_RETURN (S_WCSSPN) TST_IF_RETURN (S_WCSSPN)

5
localedata/tests-mbwc/tst_wcsstr.c
View File

@ -32,7 +32,7 @@ tst_wcsstr (FILE * fp, int debug_flg)
{ {
fprintf (stderr, fprintf (stderr,
" ret[ 0 ] = 0x%lx <-> 0x%lx = ws2[ 0 ]\n", " 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, fprintf (stderr,
" : ret[ %d ] = 0x%lx <-> 0x%lx = ws2[ %d ]\n", " : 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]) if (ret[i] != ws2[i])

3
localedata/tests-mbwc/tst_wcstod.c
View File

@ -30,7 +30,8 @@ tst_wcstod (FILE * fp, int debug_flg)
{ {
fprintf (stdout, "wcstod() [ %s : %d ] ret = %f\n", locale, fprintf (stdout, "wcstod() [ %s : %d ] ret = %f\n", locale,
rec + 1, ret); 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) TST_IF_RETURN (S_WCSTOD)

8
localedata/tests-mbwc/tst_wcstok.c
View File

@ -35,11 +35,11 @@ tst_wcstok (FILE * fp, int debug_flg)
if (debug_flg) if (debug_flg)
{ {
fprintf (stdout, "wcstok() [ %s : %d : %d ] *ret = 0x%lx\n", 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) if (pt && *pt)
{ {
fprintf (stdout, " *pt = 0x%lx\n", fprintf (stdout, " *pt = 0x%lx\n",
*pt); (unsigned long int) *pt);
} }
} }
@ -63,7 +63,9 @@ tst_wcstok (FILE * fp, int debug_flg)
{ {
fprintf (stderr, fprintf (stderr,
" ret[%d] = 0x%lx <-> " " 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]) if (ret[i] != ws_ex[i])

2
localedata/tests-mbwc/tst_wcstombs.c
View File

@ -38,7 +38,7 @@ tst_wcstombs (FILE * fp, int debug_flg)
if (debug_flg) if (debug_flg)
{ {
fprintf (stdout, "wcstombs: ret = %d\n", ret); fprintf (stdout, "wcstombs: ret = %zu\n", ret);
} }
TST_IF_RETURN (S_WCSTOMBS) TST_IF_RETURN (S_WCSTOMBS)