diff options
author | tjr <tjr@FreeBSD.org> | 2003-10-31 13:29:00 +0000 |
---|---|---|
committer | tjr <tjr@FreeBSD.org> | 2003-10-31 13:29:00 +0000 |
commit | 44278bfe73f956cea7b76d295f2ece178659f4f9 (patch) | |
tree | ec2a611770579a4bf72311eb29886037f4ae1701 /lib/libc/locale | |
parent | cd4a9b77a6df92c6fce807de7c5bf3271dbcb55c (diff) | |
download | FreeBSD-src-44278bfe73f956cea7b76d295f2ece178659f4f9.zip FreeBSD-src-44278bfe73f956cea7b76d295f2ece178659f4f9.tar.gz |
Don't bother passing a freshly-zeroed mbstate to mbsrtowcs() etc.
when the current implementation won't use it, anyway. Just pass NULL.
This will need to be changed when state-dependent encodings are
supported, but there's no need to take the performance hit
in the meantime.
Diffstat (limited to 'lib/libc/locale')
-rw-r--r-- | lib/libc/locale/wcsftime.c | 15 | ||||
-rw-r--r-- | lib/libc/locale/wcstod.c | 33 | ||||
-rw-r--r-- | lib/libc/locale/wcstof.c | 28 | ||||
-rw-r--r-- | lib/libc/locale/wcstold.c | 24 |
4 files changed, 25 insertions, 75 deletions
diff --git a/lib/libc/locale/wcsftime.c b/lib/libc/locale/wcsftime.c index 1ed5b07..bd1cee1 100644 --- a/lib/libc/locale/wcsftime.c +++ b/lib/libc/locale/wcsftime.c @@ -50,8 +50,6 @@ size_t wcsftime(wchar_t * __restrict wcs, size_t maxsize, const wchar_t * __restrict format, const struct tm * __restrict timeptr) { - static const mbstate_t initial; - mbstate_t state; char *dst, *dstp, *sformat; size_t n, sflen; int sverrno; @@ -61,15 +59,17 @@ wcsftime(wchar_t * __restrict wcs, size_t maxsize, /* * Convert the supplied format string to a multibyte representation * for strftime(), which only handles single-byte characters. + * + * We pass NULL as the state pointer to wcrtomb() because we don't + * support state-dependent encodings and don't want to waste time + * creating a zeroed mbstate_t that will not be used. */ - state = initial; - sflen = wcsrtombs(NULL, &format, 0, &state); + sflen = wcsrtombs(NULL, &format, 0, NULL); if (sflen == (size_t)-1) goto error; if ((sformat = malloc(sflen + 1)) == NULL) goto error; - state = initial; - wcsrtombs(sformat, &format, sflen + 1, &state); + wcsrtombs(sformat, &format, sflen + 1, NULL); /* * Allocate memory for longest multibyte sequence that will fit @@ -86,9 +86,8 @@ wcsftime(wchar_t * __restrict wcs, size_t maxsize, goto error; if (strftime(dst, maxsize, sformat, timeptr) == 0) goto error; - state = initial; dstp = dst; - n = mbsrtowcs(wcs, (const char **)&dstp, maxsize, &state); + n = mbsrtowcs(wcs, (const char **)&dstp, maxsize, NULL); if (n == (size_t)-2 || n == (size_t)-1 || dstp != NULL) goto error; diff --git a/lib/libc/locale/wcstod.c b/lib/libc/locale/wcstod.c index fbbe405..1f13e2f 100644 --- a/lib/libc/locale/wcstod.c +++ b/lib/libc/locale/wcstod.c @@ -43,12 +43,10 @@ __FBSDID("$FreeBSD$"); double wcstod(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr) { - static const mbstate_t initial; - mbstate_t state; double val; - char *buf, *end, *p; + char *buf, *end; const wchar_t *wcp; - size_t clen, len; + size_t len; while (iswspace(*nptr)) nptr++; @@ -62,18 +60,20 @@ wcstod(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr) * the input string contains a lot of text after the number * duplicates a lot of strtod()'s functionality and slows down the * most common cases. + * + * We pass NULL as the state pointer to wcrtomb() because we don't + * support state-dependent encodings and don't want to waste time + * creating a zeroed mbstate_t that will not be used. */ - state = initial; wcp = nptr; - if ((len = wcsrtombs(NULL, &wcp, 0, &state)) == (size_t)-1) { + if ((len = wcsrtombs(NULL, &wcp, 0, NULL)) == (size_t)-1) { if (endptr != NULL) *endptr = (wchar_t *)nptr; return (0.0); } if ((buf = malloc(len + 1)) == NULL) return (0.0); - state = initial; - wcsrtombs(buf, &wcp, len + 1, &state); + wcsrtombs(buf, &wcp, len + 1, NULL); /* Let strtod() do most of the work for us. */ val = strtod(buf, &end); @@ -84,22 +84,9 @@ wcstod(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr) * where it ended, count multibyte characters to find the * corresponding position in the wide char string. */ - if (endptr != NULL) { -#if 1 /* Fast, assume 1:1 WC:MBS mapping. */ + if (endptr != NULL) + /* XXX Assume each wide char is one byte. */ *endptr = (wchar_t *)nptr + (end - buf); - (void)clen; - (void)p; -#else /* Slow, conservative approach. */ - state = initial; - *endptr = (wchar_t *)nptr; - p = buf; - while (p < end && - (clen = mbrlen(p, end - p, &state)) > 0) { - p += clen; - (*endptr)++; - } -#endif - } free(buf); diff --git a/lib/libc/locale/wcstof.c b/lib/libc/locale/wcstof.c index ebe392e..909db0b 100644 --- a/lib/libc/locale/wcstof.c +++ b/lib/libc/locale/wcstof.c @@ -37,46 +37,28 @@ __FBSDID("$FreeBSD$"); float wcstof(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr) { - static const mbstate_t initial; - mbstate_t state; float val; - char *buf, *end, *p; + char *buf, *end; const wchar_t *wcp; - size_t clen, len; + size_t len; while (iswspace(*nptr)) nptr++; - state = initial; wcp = nptr; - if ((len = wcsrtombs(NULL, &wcp, 0, &state)) == (size_t)-1) { + if ((len = wcsrtombs(NULL, &wcp, 0, NULL)) == (size_t)-1) { if (endptr != NULL) *endptr = (wchar_t *)nptr; return (0.0); } if ((buf = malloc(len + 1)) == NULL) return (0.0); - state = initial; - wcsrtombs(buf, &wcp, len + 1, &state); + wcsrtombs(buf, &wcp, len + 1, NULL); val = strtof(buf, &end); - if (endptr != NULL) { -#if 1 /* Fast, assume 1:1 WC:MBS mapping. */ + if (endptr != NULL) *endptr = (wchar_t *)nptr + (end - buf); - (void)clen; - (void)p; -#else /* Slow, conservative approach. */ - state = initial; - *endptr = (wchar_t *)nptr; - p = buf; - while (p < end && - (clen = mbrlen(p, end - p, &state)) > 0) { - p += clen; - (*endptr)++; - } -#endif - } free(buf); diff --git a/lib/libc/locale/wcstold.c b/lib/libc/locale/wcstold.c index 9dee722..6228784 100644 --- a/lib/libc/locale/wcstold.c +++ b/lib/libc/locale/wcstold.c @@ -37,8 +37,6 @@ __FBSDID("$FreeBSD$"); long double wcstold(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr) { - static const mbstate_t initial; - mbstate_t state; long double val; char *buf, *end, *p; const wchar_t *wcp; @@ -47,36 +45,20 @@ wcstold(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr) while (iswspace(*nptr)) nptr++; - state = initial; wcp = nptr; - if ((len = wcsrtombs(NULL, &wcp, 0, &state)) == (size_t)-1) { + if ((len = wcsrtombs(NULL, &wcp, 0, NULL)) == (size_t)-1) { if (endptr != NULL) *endptr = (wchar_t *)nptr; return (0.0); } if ((buf = malloc(len + 1)) == NULL) return (0.0); - state = initial; - wcsrtombs(buf, &wcp, len + 1, &state); + wcsrtombs(buf, &wcp, len + 1, NULL); val = strtold(buf, &end); - if (endptr != NULL) { -#if 1 /* Fast, assume 1:1 WC:MBS mapping. */ + if (endptr != NULL) *endptr = (wchar_t *)nptr + (end - buf); - (void)clen; - (void)p; -#else /* Slow, conservative approach. */ - state = initial; - *endptr = (wchar_t *)nptr; - p = buf; - while (p < end && - (clen = mbrlen(p, end - p, &state)) > 0) { - p += clen; - (*endptr)++; - } -#endif - } free(buf); |