diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-01-09 21:55:11 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2006-01-09 21:55:11 +0000 |
| commit | 06f313e361a523605ba6d4c9cdc67a7353cd367c (patch) | |
| tree | 007c600599bb65c7a685423c611977f6e4eb26e6 /stdio-common | |
| parent | bd09caaa27e6c4613afc4a91a70f09babca1aef2 (diff) | |
Updated to fedora-glibc-20060109T2152cvs/fedora-glibc-2_3_90-30
Diffstat (limited to 'stdio-common')
| -rw-r--r-- | stdio-common/printf-parsemb.c | 5 | ||||
| -rw-r--r-- | stdio-common/tst-fmemopen2.c | 2 | ||||
| -rw-r--r-- | stdio-common/tstdiomisc.c | 21 |
3 files changed, 10 insertions, 18 deletions
diff --git a/stdio-common/printf-parsemb.c b/stdio-common/printf-parsemb.c index c55b97060c..2f21fc6365 100644 --- a/stdio-common/printf-parsemb.c +++ b/stdio-common/printf-parsemb.c @@ -1,5 +1,5 @@ /* Helper functions for parsing printf format strings. - Copyright (C) 1995-2000, 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 1995-2000,2002,2003,2004,2006 Free Software Foundation, Inc. This file is part of th GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -64,7 +64,8 @@ __find_specmb (const UCHAR_T *format, mbstate_t *ps) /* Remove any hints of a wrong encoding. */ ps->__count = 0; - if (! isascii (*format) && (len = __mbrlen (format, MB_CUR_MAX, ps)) > 0) + if (! isascii (*format) + && (len = __mbrlen ((const CHAR_T *) format, MB_CUR_MAX, ps)) > 0) format += len; else ++format; diff --git a/stdio-common/tst-fmemopen2.c b/stdio-common/tst-fmemopen2.c index bcb136e8c1..81beddddef 100644 --- a/stdio-common/tst-fmemopen2.c +++ b/stdio-common/tst-fmemopen2.c @@ -28,7 +28,7 @@ do_test (void) o = ftello (fp); if (o != 0) { - printf ("second ftello returned %ld, expected %zu\n", o, 0); + printf ("second ftello returned %ld, expected %zu\n", o, (off_t) 0); result = 1; } if (fseeko (fp, 0, SEEK_END) != 0) diff --git a/stdio-common/tstdiomisc.c b/stdio-common/tstdiomisc.c index e89487cb45..db038fa2b0 100644 --- a/stdio-common/tstdiomisc.c +++ b/stdio-common/tstdiomisc.c @@ -46,15 +46,8 @@ t2 (void) return result; } -#if FLT_EVAL_METHOD == 2 -volatile long double dbl_max = LDBL_MAX; -# define FLT_FLT_FMT "%Lf %LF" -# define FLT_FLT_WFMT L"%Lf %LF" -#else -# define dbl_max DBL_MAX -# define FLT_FLT_FMT "%f %F" -# define FLT_FLT_WFMT L"%f %F" -#endif +volatile double nanval; + static int F (void) @@ -63,9 +56,9 @@ F (void) wchar_t wbuf[10]; int result; - snprintf (buf, sizeof buf, FLT_FLT_FMT, - dbl_max * dbl_max - dbl_max * dbl_max, - dbl_max * dbl_max - dbl_max * dbl_max); + nanval = NAN; + + snprintf (buf, sizeof buf, "%f %F", nanval, nanval); result = strcmp (buf, "nan NAN") != 0; printf ("expected \"nan NAN\", got \"%s\"\n", buf); @@ -73,9 +66,7 @@ F (void) result |= strcmp (buf, "inf INF") != 0; printf ("expected \"inf INF\", got \"%s\"\n", buf); - swprintf (wbuf, sizeof wbuf / sizeof (wbuf[0]), FLT_FLT_WFMT, - dbl_max * dbl_max - dbl_max * dbl_max, - dbl_max * dbl_max - dbl_max * dbl_max); + swprintf (wbuf, sizeof wbuf / sizeof (wbuf[0]), L"%f %F", nanval, nanval); result |= wcscmp (wbuf, L"nan NAN") != 0; printf ("expected L\"nan NAN\", got L\"%S\"\n", wbuf); |