diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2012-01-08 07:19:21 -0500 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2012-01-08 07:19:21 -0500 |
| commit | d3ed722566f42d3f614b1221a8e4f19092976531 (patch) | |
| tree | 4a63e059ef599167cf407311188551fe72221d8d /iconv/iconv_prog.c | |
| parent | a0da5fe1e49b819b4d90b77915e21cddd397d064 (diff) | |
Simplify char16_t implementation
Diffstat (limited to 'iconv/iconv_prog.c')
| -rw-r--r-- | iconv/iconv_prog.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c index 13facc8235..0d62a07147 100644 --- a/iconv/iconv_prog.c +++ b/iconv/iconv_prog.c @@ -719,12 +719,9 @@ add_known_names (struct gconv_module *node) add_known_names (node->right); do { - 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 - && strcmp (node->to_string, "CHAR16") != 0) + if (strcmp (node->from_string, "INTERNAL") != 0) + tsearch (node->from_string, &printlist, (__compar_fn_t) strverscmp); + if (strcmp (node->to_string, "INTERNAL") != 0) tsearch (node->to_string, &printlist, (__compar_fn_t) strverscmp); node = node->same; @@ -750,8 +747,7 @@ insert_cache (void) { const char *str = strtab + hashtab[cnt].string_offset; - if (strcmp (str, "INTERNAL") != 0 - && strcmp (str, "CHAR16") != 0) + if (strcmp (str, "INTERNAL") != 0) tsearch (str, &printlist, (__compar_fn_t) strverscmp); } } |