From 8a6537b001828486c139509534c4f13ff5373631 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 19 Aug 2006 17:54:05 +0000 Subject: * 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. --- iconv/iconv_prog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'iconv/iconv_prog.c') 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. */ -- cgit v1.2.3