mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-29 00:01:12 +00:00
Update.
2004-02-10 Ulrich Drepper <drepper@redhat.com> * stdio-common/_i18n_number.h: Finish last patch.
This commit is contained in:
parent
408d46a538
commit
43e56b0efc
@ -1,3 +1,7 @@
|
|||||||
|
2004-02-10 Ulrich Drepper <drepper@redhat.com>
|
||||||
|
|
||||||
|
* stdio-common/_i18n_number.h: Finish last patch.
|
||||||
|
|
||||||
2004-02-09 Ulrich Drepper <drepper@redhat.com>
|
2004-02-09 Ulrich Drepper <drepper@redhat.com>
|
||||||
|
|
||||||
* sysdeps/i386/i686/memcmp.S: New file. Patch by HJ Lu.
|
* sysdeps/i386/i686/memcmp.S: New file. Patch by HJ Lu.
|
||||||
|
@ -32,8 +32,8 @@ _i18n_number_rewrite (CHAR_T *w, CHAR_T *rear_ptr)
|
|||||||
# define decimal NULL
|
# define decimal NULL
|
||||||
# define thousands NULL
|
# define thousands NULL
|
||||||
#else
|
#else
|
||||||
# define wdecimal L'\0'
|
wint_t wdecimal = L'\0';
|
||||||
# define wthousands L'\0'
|
wint_t wthousands = L'\0';
|
||||||
char decimal[MB_LEN_MAX];
|
char decimal[MB_LEN_MAX];
|
||||||
char thousands[MB_LEN_MAX];
|
char thousands[MB_LEN_MAX];
|
||||||
#endif
|
#endif
|
||||||
@ -44,6 +44,10 @@ _i18n_number_rewrite (CHAR_T *w, CHAR_T *rear_ptr)
|
|||||||
wctrans_t map = __wctrans ("to_outpunct");
|
wctrans_t map = __wctrans ("to_outpunct");
|
||||||
if (map != NULL)
|
if (map != NULL)
|
||||||
{
|
{
|
||||||
|
wdecimal = __towctrans (L'.', map);
|
||||||
|
wthousands = __towctrans (L',', map);
|
||||||
|
|
||||||
|
#ifndef COMPILE_WPRINTF
|
||||||
mbstate_t state;
|
mbstate_t state;
|
||||||
memset (&state, '\0', sizeof (state));
|
memset (&state, '\0', sizeof (state));
|
||||||
|
|
||||||
@ -54,6 +58,7 @@ _i18n_number_rewrite (CHAR_T *w, CHAR_T *rear_ptr)
|
|||||||
|
|
||||||
if (__wcrtomb (thousands, wthousands, &state) == (size_t) -1)
|
if (__wcrtomb (thousands, wthousands, &state) == (size_t) -1)
|
||||||
memcpy (thousands, ",", 2);
|
memcpy (thousands, ",", 2);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Copy existing string so that nothing gets overwritten. */
|
/* Copy existing string so that nothing gets overwritten. */
|
||||||
|
Loading…
Reference in New Issue
Block a user