diff options
| author | Andreas Schwab <schwab@redhat.com> | 2009-10-12 13:48:49 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2009-10-12 13:48:49 +0200 |
| commit | 65179518b1cb8a755366e88884eec4b1a518b978 (patch) | |
| tree | b7481b2e654b61ee21f53fa278334af9071f5be8 /locale | |
| parent | 0c9cd95902e46a4a9e7684aea494a969787f48ac (diff) | |
| parent | 1abedcdad2eef3d262c115ac13f069900338727c (diff) | |
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/C-time.c | 4 | ||||
| -rw-r--r-- | locale/programs/locale-spec.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/locale/C-time.c b/locale/C-time.c index a9275d9ebe..368ffce7ad 100644 --- a/locale/C-time.c +++ b/locale/C-time.c @@ -134,10 +134,10 @@ const struct locale_data _nl_C_LC_TIME attribute_hidden = { .wstr = (const uint32_t *) L"" }, { .wstr = (const uint32_t *) L"" }, { .string = "\7" }, - { .word = 19971201 }, + { .word = 19971130 }, { .string = "\4" }, - { .string = "\7" }, { .string = "\1" }, + { .string = "\2" }, { .string = "\1" }, { .string = "" }, { .string = "%a %b %e %H:%M:%S %Z %Y" }, diff --git a/locale/programs/locale-spec.c b/locale/programs/locale-spec.c index 6334f4c5ff..63a7a32e05 100644 --- a/locale/programs/locale-spec.c +++ b/locale/programs/locale-spec.c @@ -1,5 +1,5 @@ /* Handle special requests. - Copyright (C) 1996, 1997, 1999, 2005 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1999, 2005, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996. @@ -124,4 +124,7 @@ locale_special (const char *name, int show_category_name, return; } #endif + + /* If nothing matches, fail. */ + error (1, 0, gettext ("unknown name \"%s\""), name); } |