diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-08-13 05:42:43 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-08-13 05:42:43 +0000 |
| commit | 644eff0c9fde2da05a4edcbe49d27f528286a887 (patch) | |
| tree | 5dbb52555ac8e1aa35f3e1bac14d9618bad32c32 /locale | |
| parent | 30c06335ce753f14f5c46f6fc7080100992b3f17 (diff) | |
| download | glibc-644eff0c9fde2da05a4edcbe49d27f528286a887.tar.gz | |
Update.
2004-08-10 GOTO Masanori <gotom@debian.or.jp>
* locale/C-time.c: Change default ERA value from NULL to "".
* locale/tst-C-locale.c: Add test case for ERA keywords.
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/C-time.c | 4 | ||||
| -rw-r--r-- | locale/tst-C-locale.c | 20 |
2 files changed, 21 insertions, 3 deletions
diff --git a/locale/C-time.c b/locale/C-time.c index a8534b1704..9047587e4a 100644 --- a/locale/C-time.c +++ b/locale/C-time.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-2000, 2001, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1995-2000, 2001, 2002, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1995. @@ -76,7 +76,7 @@ const struct locale_data _nl_C_LC_TIME attribute_hidden = { .string = "%m/%d/%y" }, { .string = "%H:%M:%S" }, { .string = "%I:%M:%S %p" }, - { .string = NULL }, + { .string = "" }, { .string = "" }, { .string = "" }, { .string = "" }, diff --git a/locale/tst-C-locale.c b/locale/tst-C-locale.c index d568b55060..c568cf404a 100644 --- a/locale/tst-C-locale.c +++ b/locale/tst-C-locale.c @@ -1,5 +1,5 @@ /* Tests of C and POSIX locale contents. - Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2000. @@ -154,6 +154,11 @@ run_test (const char *locname) STRTEST (D_FMT, "%m/%d/%y"); STRTEST (T_FMT, "%H:%M:%S"); STRTEST (T_FMT_AMPM, "%I:%M:%S %p"); + STRTEST (ERA, ""); + STRTEST (ERA_D_FMT, ""); + STRTEST (ERA_T_FMT, ""); + STRTEST (ERA_D_T_FMT, ""); + STRTEST (ALT_DIGITS, ""); STRTEST (RADIXCHAR, "."); STRTEST (THOUSEP, ""); @@ -206,6 +211,10 @@ run_test (const char *locname) WSTRTEST (_NL_WD_FMT, L"%m/%d/%y"); WSTRTEST (_NL_WT_FMT, L"%H:%M:%S"); WSTRTEST (_NL_WT_FMT_AMPM, L"%I:%M:%S %p"); + WSTRTEST (_NL_WERA_D_FMT, L""); + WSTRTEST (_NL_WERA_T_FMT, L""); + WSTRTEST (_NL_WERA_D_T_FMT, L""); + WSTRTEST (_NL_WALT_DIGITS, L""); STRTEST (_DATE_FMT, "%a %b %e %H:%M:%S %Z %Y"); WSTRTEST (_NL_W_DATE_FMT, L"%a %b %e %H:%M:%S %Z %Y"); @@ -297,6 +306,11 @@ run_test (const char *locname) STRTEST (D_FMT, "%m/%d/%y"); STRTEST (T_FMT, "%H:%M:%S"); STRTEST (T_FMT_AMPM, "%I:%M:%S %p"); + STRTEST (ERA, ""); + STRTEST (ERA_D_FMT, ""); + STRTEST (ERA_T_FMT, ""); + STRTEST (ERA_D_T_FMT, ""); + STRTEST (ALT_DIGITS, ""); STRTEST (RADIXCHAR, "."); STRTEST (THOUSEP, ""); @@ -349,6 +363,10 @@ run_test (const char *locname) WSTRTEST (_NL_WD_FMT, L"%m/%d/%y"); WSTRTEST (_NL_WT_FMT, L"%H:%M:%S"); WSTRTEST (_NL_WT_FMT_AMPM, L"%I:%M:%S %p"); + WSTRTEST (_NL_WERA_D_FMT, L""); + WSTRTEST (_NL_WERA_T_FMT, L""); + WSTRTEST (_NL_WERA_D_T_FMT, L""); + WSTRTEST (_NL_WALT_DIGITS, L""); STRTEST (_DATE_FMT, "%a %b %e %H:%M:%S %Z %Y"); WSTRTEST (_NL_W_DATE_FMT, L"%a %b %e %H:%M:%S %Z %Y"); |