diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-10-26 23:41:17 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-10-26 23:41:17 +0000 |
| commit | d8337213c83c3bd4aa32e16669745dd7ee32b329 (patch) | |
| tree | c9f1296e2e3f355d296e4d8258c8380393006fc0 /locale/localeconv.c | |
| parent | 5be068fc154b697b56cce171a73eccf572f86937 (diff) | |
Update.
* locale/C-monetary.c: Set mon_decimal to empty string.
Add missing entry _NL_MONETARY_CRNCYSTR.
* stdio-common/printf_fp.c: If MON_DECIAL_POINT is not provided use
DECIMAL_POINT information.
* locale/C-numeric.c: Set mon_grouping entry to empty string.
* locale/C-time.c: Add date_fmt entries. Remove two wrong entries.
Correct value for number of entries.
* locale/localeconv.c: Normalize result passed back in .grouping.
Fix assignment to .int_* entries.
* locale/Makefile (tests): Add tst-C-locale.
* locale/tst-C-locale.c: New file.
* locale/setlocale.c: Use LOCALEDIR and not LOCALE_PATH to locate
locale files.
* locale/newlocale.c: Likewise.
2000-10-26 GOTO Masanori <gotom@debian.or.jp>
* locale/langinfo.h: Define _DATE_FMT and _NL_W_DATE_FMT.
* locale/categories.def: New support for date_fmt.
* locale/programs/ld-time.c: Likewise.
* locale/programs/locfile-kw.gperf: Likewise.
* locale/programs/locfile-kw.h: Likewise.
* locale/programs/locfile-token.h: Likewise.
2000-10-26 Jakub Jelinek <jakub@redhat.com>
* sysdeps/ieee754/ldbl-128/e_hypotl.c: New.
* math/libm-test.inc (cabs_test, cexp_test, csqrt_test, hypot_test):
Increase precision of constants.
* sysdeps/alpha/fpu/libm-test-ulps: Update.
* sysdeps/arm/libm-test-ulps: Update.
* sysdeps/i386/fpu/libm-test-ulps: Update.
* sysdeps/ia64/fpu/libm-test-ulps: Update.
* sysdeps/m68k/fpu/libm-test-ulps: Update.
* sysdeps/mips/fpu/libm-test-ulps: Update.
* sysdeps/powerpc/fpu/libm-test-ulps: Update.
* sysdeps/sparc/sparc32/fpu/libm-test-ulps: Update.
* sysdeps/sparc/sparc64/fpu/libm-test-ulps: Update.
* sysdeps/sh/sh4/fpu/libm-test-ulps: Update.
* sysdeps/s390/fpu/libm-test-ulps: Update.
2000-10-26 Ulrich Drepper <drepper@redhat.com>
Diffstat (limited to 'locale/localeconv.c')
| -rw-r--r-- | locale/localeconv.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/locale/localeconv.c b/locale/localeconv.c index 0f545370f7..c5754fed93 100644 --- a/locale/localeconv.c +++ b/locale/localeconv.c @@ -29,6 +29,8 @@ __localeconv (void) result.decimal_point = (char *) _NL_CURRENT (LC_NUMERIC, DECIMAL_POINT); result.thousands_sep = (char *) _NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP); result.grouping = (char *) _NL_CURRENT (LC_NUMERIC, GROUPING); + if (*result.grouping == CHAR_MAX || *result.grouping == -1) + result.grouping = (char *) ""; result.int_curr_symbol = (char *) _NL_CURRENT (LC_MONETARY, INT_CURR_SYMBOL); result.currency_symbol = (char *) _NL_CURRENT (LC_MONETARY, CURRENCY_SYMBOL); @@ -37,6 +39,8 @@ __localeconv (void) result.mon_thousands_sep = (char *) _NL_CURRENT (LC_MONETARY, MON_THOUSANDS_SEP); result.mon_grouping = (char *) _NL_CURRENT (LC_MONETARY, MON_GROUPING); + if (*result.mon_grouping == CHAR_MAX || *result.mon_grouping == -1) + result.mon_grouping = (char *) ""; result.positive_sign = (char *) _NL_CURRENT (LC_MONETARY, POSITIVE_SIGN); result.negative_sign = (char *) _NL_CURRENT (LC_MONETARY, NEGATIVE_SIGN); result.int_frac_digits = *(char *) _NL_CURRENT (LC_MONETARY, @@ -48,12 +52,18 @@ __localeconv (void) result.n_sep_by_space = *(char *) _NL_CURRENT (LC_MONETARY, N_SEP_BY_SPACE); result.p_sign_posn = *(char *) _NL_CURRENT (LC_MONETARY, P_SIGN_POSN); result.n_sign_posn = *(char *) _NL_CURRENT (LC_MONETARY, N_SIGN_POSN); - result.p_cs_precedes = *(char *) _NL_CURRENT (LC_MONETARY, INT_P_CS_PRECEDES); - result.p_sep_by_space = *(char *) _NL_CURRENT (LC_MONETARY, INT_P_SEP_BY_SPACE); - result.n_cs_precedes = *(char *) _NL_CURRENT (LC_MONETARY, INT_N_CS_PRECEDES); - result.n_sep_by_space = *(char *) _NL_CURRENT (LC_MONETARY, INT_N_SEP_BY_SPACE); - result.p_sign_posn = *(char *) _NL_CURRENT (LC_MONETARY, INT_P_SIGN_POSN); - result.n_sign_posn = *(char *) _NL_CURRENT (LC_MONETARY, INT_N_SIGN_POSN); + result.int_p_cs_precedes = *(char *) _NL_CURRENT (LC_MONETARY, + INT_P_CS_PRECEDES); + result.int_p_sep_by_space = *(char *) _NL_CURRENT (LC_MONETARY, + INT_P_SEP_BY_SPACE); + result.int_n_cs_precedes = *(char *) _NL_CURRENT (LC_MONETARY, + INT_N_CS_PRECEDES); + result.int_n_sep_by_space = *(char *) _NL_CURRENT (LC_MONETARY, + INT_N_SEP_BY_SPACE); + result.int_p_sign_posn = *(char *) _NL_CURRENT (LC_MONETARY, + INT_P_SIGN_POSN); + result.int_n_sign_posn = *(char *) _NL_CURRENT (LC_MONETARY, + INT_N_SIGN_POSN); return &result; } |