diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-12-27 05:05:12 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-12-27 05:05:12 +0000 |
| commit | 70e51ab9f37ec84b23ff5e090e0d9a322baf523d (patch) | |
| tree | 1891740b82b92c022c072834b979196199ae0b93 /locale/programs/ld-time.c | |
| parent | c392db7c4be39bf2ad8668f6e75a1ec219da6b0e (diff) | |
| download | glibc-70e51ab9f37ec84b23ff5e090e0d9a322baf523d.zip glibc-70e51ab9f37ec84b23ff5e090e0d9a322baf523d.tar.gz glibc-70e51ab9f37ec84b23ff5e090e0d9a322baf523d.tar.bz2 | |
Update.
* locale/programs/ld-collate.c (collate_output): Don't start with empty
extrapool and indirectpool obstacks since we need the offsets to be
nonzero.
(collate_read): Call load_locale, not find_locale.
* locale/programs/ld-ctype.c (ctype_finish): If LC_CTYPE category
wasn't defined in the file also initialize repertoire if possible.
* locale/programs/ld-time.c (time_finish): Fix message string.
* locale/programs/linereader.c: Cast parameters of lr_error to
correct type to prevnet warning.
* locale/programs/localedef.c (load_locale): New file.
* locale/programs/localedef.h: Add its prototype.
* locale/programs/repertoire.c (repertoire_new_char): Add missing
parameters to lr_error call.
* localedata/Makefile: Enable running tests again.
* localedata/tests/test2.def: Adjust syntax to new specification.
* localedata/tests/test3.def: Likewise.
* localedata/tst-trans.sh: Redirect output of program into file.
* string/strcoll.c: Fix many error in new implementation to make it
pass (at least) the test suite.
* locale/Makefile: Don't link localedef statically anymore.
* locale/ld-collate.c (struct element_t): Add field is_character and
use it to distinguish real character from collating elements and
symbols.
* locale/programs/ld-time.c: Likewise.
Diffstat (limited to 'locale/programs/ld-time.c')
| -rw-r--r-- | locale/programs/ld-time.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c index 5e12c9b..e317fc1 100644 --- a/locale/programs/ld-time.c +++ b/locale/programs/ld-time.c @@ -154,7 +154,8 @@ time_finish (struct localedef_t *locale, struct charmap_t *charmap) empty one. */ if (time == NULL) { - error (0, 0, _("No definition for %s category found"), "LC_TIME"); + if (! be_quiet) + error (0, 0, _("No definition for %s category found"), "LC_TIME"); time_startup (NULL, locale, 0); time = locale->categories[LC_TIME].time; nothing = 1; @@ -481,7 +482,7 @@ time_finish (struct localedef_t *locale, struct charmap_t *charmap) time->cal_direction = 1; else if (time->cal_direction > 3) error (0, 0, _("\ -%s: values for field `%s' must not be larger than 3"), +%s: values for field `%s' must not be larger than %d"), "LC_TIME", "cal_direction", 3); /* XXX We don't perform any tests on the timezone value since this is |