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.h | |
| parent | 96d5c5da1ddd021a4b8fddda8799311e2051696b (diff) | |
| download | glibc-8a6537b001828486c139509534c4f13ff5373631.tar.gz glibc-8a6537b001828486c139509534c4f13ff5373631.tar.xz 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/charmap.h')
| -rw-r--r-- | locale/programs/charmap.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/locale/programs/charmap.h b/locale/programs/charmap.h index a3f31d6333..fd711f2d11 100644 --- a/locale/programs/charmap.h +++ b/locale/programs/charmap.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1996-1999, 2001, 2003, 2005 Free Software Foundation, Inc. +/* Copyright (C) 1996-1999,2001,2003,2005,2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1996. @@ -69,7 +69,8 @@ extern bool enc_not_ascii_compatible; /* Prototypes for charmap handling functions. */ extern struct charmap_t *charmap_read (const char *filename, int verbose, - int be_quiet, int use_default); + int error_not_found, int be_quiet, + int use_default); /* Return the value stored under the given key in the hashing table. */ extern struct charseq *charmap_find_value (const struct charmap_t *charmap, |