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/charmap.c | |
parent | 96d5c5da1ddd021a4b8fddda8799311e2051696b (diff) | |
download | glibc-8a6537b001828486c139509534c4f13ff5373631.tar.gz |
* 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/charmap.c')
-rw-r--r-- | locale/programs/charmap.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/locale/programs/charmap.c b/locale/programs/charmap.c index e56b0be81c..52a69de4b0 100644 --- a/locale/programs/charmap.c +++ b/locale/programs/charmap.c @@ -86,7 +86,8 @@ cmlr_open (const char *directory, const char *name, kw_hash_fct_t hf) } struct charmap_t * -charmap_read (const char *filename, int verbose, int be_quiet, int use_default) +charmap_read (const char *filename, int verbose, int error_not_found, + int be_quiet, int use_default) { struct charmap_t *result = NULL; @@ -132,7 +133,7 @@ charmap_read (const char *filename, int verbose, int be_quiet, int use_default) if (cmfile != NULL) result = parse_charmap (cmfile, verbose, be_quiet); - if (result == NULL && !be_quiet) + if (result == NULL && error_not_found) WITH_CUR_LOCALE (error (0, errno, _("\ character map file `%s' not found"), filename)); } |