diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2006-08-19 17:54:05 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2006-08-19 17:54:05 +0000 |
| commit | 8a6537b001828486c139509534c4f13ff5373631 (patch) | |
| tree | ef14bdb81d17c86c0589be46e2df526fa4dccde9 /locale/programs/localedef.c | |
| parent | 96d5c5da1ddd021a4b8fddda8799311e2051696b (diff) | |
| download | glibc-8a6537b001828486c139509534c4f13ff5373631.tar glibc-8a6537b001828486c139509534c4f13ff5373631.tar.gz glibc-8a6537b001828486c139509534c4f13ff5373631.tar.bz2 glibc-8a6537b001828486c139509534c4f13ff5373631.zip | |
* locale/programs/charmap.c (charmap_read): Add new parameter. It
tells us when not finding a charmap file is an error.
* locale/programs/charmap.h: Adjust charmap_read prototype.
* iconv/iconv_prog.c (main): Tell charmap_read it's no error if we
cannot find a charmap.
* locale/programs/localedef.c (main): Adjust charmap_read call.
Diffstat (limited to 'locale/programs/localedef.c')
| -rw-r--r-- | locale/programs/localedef.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c index f705f34a75..5df07e94c6 100644 --- a/locale/programs/localedef.c +++ b/locale/programs/localedef.c @@ -243,7 +243,7 @@ main (int argc, char *argv[]) FATAL: system does not define `_POSIX2_LOCALEDEF'"))); /* Process charmap file. */ - charmap = charmap_read (charmap_file, verbose, be_quiet, 1); + charmap = charmap_read (charmap_file, verbose, 1, be_quiet, 1); /* Add the first entry in the locale list. */ memset (&global, '\0', sizeof (struct localedef_t)); |