From 9954432e309c8fddaec2fe53e601702a5c981624 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 7 Jan 2012 10:52:53 -0500 Subject: More char16_t and char32_t support It works now for UTF-8 locales --- iconv/iconv_prog.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'iconv/iconv_prog.c') diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c index 59c6402..13facc8 100644 --- a/iconv/iconv_prog.c +++ b/iconv/iconv_prog.c @@ -719,10 +719,12 @@ add_known_names (struct gconv_module *node) add_known_names (node->right); do { - if (strcmp (node->from_string, "INTERNAL")) + if (strcmp (node->from_string, "INTERNAL") != 0 + && strcmp (node->from_string, "CHAR16") != 0) tsearch (node->from_string, &printlist, (__compar_fn_t) strverscmp); - if (strcmp (node->to_string, "INTERNAL") != 0) + if (strcmp (node->to_string, "INTERNAL") != 0 + && strcmp (node->to_string, "CHAR16") != 0) tsearch (node->to_string, &printlist, (__compar_fn_t) strverscmp); node = node->same; @@ -748,7 +750,8 @@ insert_cache (void) { const char *str = strtab + hashtab[cnt].string_offset; - if (strcmp (str, "INTERNAL") != 0) + if (strcmp (str, "INTERNAL") != 0 + && strcmp (str, "CHAR16") != 0) tsearch (str, &printlist, (__compar_fn_t) strverscmp); } } -- cgit v1.1