diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2006-07-30 22:24:49 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2006-07-30 22:24:49 +0000 |
| commit | c10d32c83429239be3c7d7159aa0e558f6e97bcc (patch) | |
| tree | 684aed5af9b37435a0bb87db645c6f2c92ff6ff4 /locale/programs/charmap.c | |
| parent | d5ba53f90790e2c3e9c95e39db32067d7e25b34e (diff) | |
| download | glibc-c10d32c83429239be3c7d7159aa0e558f6e97bcc.tar.gz glibc-c10d32c83429239be3c7d7159aa0e558f6e97bcc.tar.xz glibc-c10d32c83429239be3c7d7159aa0e558f6e97bcc.zip | |
* locale/programs/localedef.c (add_to_readlist): Rename local
variables to avoid confusion. * locale/programs/charmap.c (charmap_read): Emit error message if charmap couldn't be found or read.
Diffstat (limited to 'locale/programs/charmap.c')
| -rw-r--r-- | locale/programs/charmap.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/locale/programs/charmap.c b/locale/programs/charmap.c index 6ac898d161..e56b0be81c 100644 --- a/locale/programs/charmap.c +++ b/locale/programs/charmap.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1998-2004,2005 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1998-2004,2005, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1996. @@ -130,13 +130,11 @@ charmap_read (const char *filename, int verbose, int be_quiet, int use_default) } if (cmfile != NULL) - { - result = parse_charmap (cmfile, verbose, be_quiet); + result = parse_charmap (cmfile, verbose, be_quiet); - if (result == NULL && !be_quiet) - WITH_CUR_LOCALE (error (0, errno, _("\ + if (result == NULL && !be_quiet) + WITH_CUR_LOCALE (error (0, errno, _("\ character map file `%s' not found"), filename)); - } } if (result == NULL && filename != NULL && strchr (filename, '/') == NULL) |