From 3c720987c599927e9a8764b9362e4751c00ec1b1 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 7 Apr 1998 20:39:52 +0000 Subject: Update. 1998-04-07 20:32 Ulrich Drepper * wcsmbs/btowc.c: Fix dozends of bugs in untested code. * wcsmbs/mbrtowc.c: Likewise. * wcsmbs/mbsnrtowcs.c: Likewise. * wcsmbs/mbsrtowcs.c: Likewise. * wcsmbs/wcrtomb.c: Likewise. * wcsmbs/wcsnrtombs.c: Likewise. * wcsmbs/wcsrtombs.c: Likewise. * wcsmbs/wctob.c: Likewise. * iconv/gconv-simple.c (__gconv_transform_ascii_ucs4): Compute position of next output character correctly. (__gconv_transform_ucs4_ascii): Count used input bytes correctly. * stdio-common/vfprintf.c (vfprintf): Clear state before used. * stdlib/strtod.c: Don't use mbtowc. 1998-04-07 19:07 H.J. Lu * libio/fileops.c (_IO_file_xsgetn): Call __underflow () when what we want is smaller than a buffer. 1998-04-07 18:14 Ulrich Drepper * elf/dl-support.c (_dl_important_hwcaps): Define dummy version of this function. --- stdlib/strtod.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'stdlib/strtod.c') diff --git a/stdlib/strtod.c b/stdlib/strtod.c index a06239d123..226b16ff5c 100644 --- a/stdlib/strtod.c +++ b/stdlib/strtod.c @@ -459,11 +459,9 @@ INTERNAL (STRTOF) (nptr, endptr, group LOCALE_PARAM) else { /* Figure out the thousands separator character. */ -#if defined _LIBC || defined _HAVE_BTOWC thousands = btowc (*_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP)); if (thousands == WEOF) thousands = L'\0'; -#endif if (thousands == L'\0') grouping = NULL; } @@ -472,9 +470,9 @@ INTERNAL (STRTOF) (nptr, endptr, group LOCALE_PARAM) grouping = NULL; /* Find the locale's decimal point character. */ - if (mbtowc ((wchar_t *) &decimal, _NL_CURRENT (LC_NUMERIC, DECIMAL_POINT), - strlen (_NL_CURRENT (LC_NUMERIC, DECIMAL_POINT))) <= 0) - decimal = (wchar_t) *_NL_CURRENT (LC_NUMERIC, DECIMAL_POINT); + decimal = btowc (*_NL_CURRENT (LC_NUMERIC, DECIMAL_POINT)); + if (decimal == WEOF) + decimal = L'.'; assert (decimal != L'\0'); /* Prepare number representation. */ -- cgit v1.2.3