* 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.
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
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);
}
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);
}
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);
}
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;
}
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;
}
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);
}
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);
}
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;
}
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);
}
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);
}
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);
}
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);
}
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);
}
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);
}
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);
}
{
if (fputwc (wcbuf[n], fp) == WEOF)
{
- printf ("%Zd: fputwc failed: %m\n", __LINE__);
+ printf ("%u: fputwc failed: %m\n", __LINE__);
exit (1);
}
}
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);
}
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);
}
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;
/* 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);
}
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
/* 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;
}
}
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);
}
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);
}
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);
}
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);
}
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);
}
{
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;
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);
}
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
/* 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;
}
}
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);
}
+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.
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;
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;
/* 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
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)
{
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;
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);
}
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)
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);
}
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);
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)
{
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])
if (debug_flg)
{
- fprintf (stderr, "mbstowcs: ret = %d\n", ret);
+ fprintf (stderr, "mbstowcs: ret = %zd\n", ret);
}
TST_IF_RETURN (S_MBSTOWCS)
{
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])
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);
}
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);
}
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);
}
if (TST_INPUT (swscanf).wch)
{
fprintf (stdout, " val_S[ 0 ] = 0x%lx\n",
- val_S[0]);
+ (unsigned long int) val_S[0]);
}
else
{
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])
{
if (ret)
{
- fprintf (stderr, "wcschr: ret = 0x%lx\n", *ret);
+ fprintf (stderr, "wcschr: ret = 0x%lx\n",
+ (unsigned long int) *ret);
}
else
{
{
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])
if (debug_flg)
{
- fprintf (stderr, "wcscspn: ret = %d\n", ret);
+ fprintf (stderr, "wcscspn: ret = %zu\n", ret);
}
TST_IF_RETURN (S_WCSCSPN)
{
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 (debug_flg)
{
- fprintf (stderr, "\nwcsncpy: n = %d\n\n", n);
+ fprintf (stderr, "\nwcsncpy: n = %zu\n\n", n);
}
ws_ex = TST_EXPECT (wcsncpy).ws;
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])
{
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)
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)
{
if (debug_flg)
{
- fprintf (stderr, "wcsrtombs: ret = %d\n", ret);
+ fprintf (stderr, "wcsrtombs: ret = %zu\n", ret);
}
TST_IF_RETURN (S_WCSRTOMBS)
if (debug_flg)
{
- fprintf (stderr, "wcsspn: ret = %d\n", ret);
+ fprintf (stderr, "wcsspn: ret = %zu\n", ret);
}
TST_IF_RETURN (S_WCSSPN)
{
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]);
}
}
{
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])
{
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)
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);
}
}
{
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])
if (debug_flg)
{
- fprintf (stdout, "wcstombs: ret = %d\n", ret);
+ fprintf (stdout, "wcstombs: ret = %zu\n", ret);
}
TST_IF_RETURN (S_WCSTOMBS)