summary refs log tree commit diff
path: root/iconv
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-08-19 17:54:05 +0000
committerUlrich Drepper <drepper@redhat.com>2006-08-19 17:54:05 +0000
commit8a6537b001828486c139509534c4f13ff5373631 (patch)
treeef14bdb81d17c86c0589be46e2df526fa4dccde9 /iconv
parent96d5c5da1ddd021a4b8fddda8799311e2051696b (diff)
downloadglibc-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 'iconv')
-rw-r--r--iconv/iconv_prog.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c
index 033cd93f23..fabdd001e3 100644
--- a/iconv/iconv_prog.c
+++ b/iconv/iconv_prog.c
@@ -183,12 +183,12 @@ main (int argc, char *argv[])
   if (strchr (from_code, '/') != NULL)
     /* The from-name might be a charmap file name.  Try reading the
        file.  */
-    from_charmap = charmap_read (from_code, /*0, 1*/1, 0, 0);
+    from_charmap = charmap_read (from_code, /*0, 1*/1, 0, 0, 0);
 
   if (strchr (orig_to_code, '/') != NULL)
     /* The to-name might be a charmap file name.  Try reading the
        file.  */
-    to_charmap = charmap_read (orig_to_code, /*0, 1,*/1,0, 0);
+    to_charmap = charmap_read (orig_to_code, /*0, 1,*/1, 0, 0, 0);
 
 
   /* Determine output file.  */