diff options
| author | Sebastian Geerken <devnull@localhost> | 2012-11-27 16:05:54 +0100 |
|---|---|---|
| committer | Sebastian Geerken <devnull@localhost> | 2012-11-27 16:05:54 +0100 |
| commit | 6526b42cefc35149af20d645f15e8bb76b0db0e2 (patch) | |
| tree | cc4b9874540709435da9657501eae1db77038d99 /src/decode.c | |
| parent | 1250d68c8767232849145d9e6abe681a562f6f5d (diff) | |
| parent | c58af8aa171908de5e0e069754803235f8ea70f8 (diff) | |
Merge.
Diffstat (limited to 'src/decode.c')
| -rw-r--r-- | src/decode.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/src/decode.c b/src/decode.c index 7ea3dc25..c5752e62 100644 --- a/src/decode.c +++ b/src/decode.c @@ -242,24 +242,6 @@ Decode *a_Decode_content_init(const char *format) } /* - * Legal names for the ASCII character set - */ -static int Decode_is_ascii(const char *str) -{ - return (!(dStrAsciiCasecmp(str, "ASCII") && - dStrAsciiCasecmp(str, "US-ASCII") && - dStrAsciiCasecmp(str, "us") && - dStrAsciiCasecmp(str, "IBM367") && - dStrAsciiCasecmp(str, "cp367") && - dStrAsciiCasecmp(str, "csASCII") && - dStrAsciiCasecmp(str, "ANSI_X3.4-1968") && - dStrAsciiCasecmp(str, "iso-ir-6") && - dStrAsciiCasecmp(str, "ANSI_X3.4-1986") && - dStrAsciiCasecmp(str, "ISO_646.irv:1991") && - dStrAsciiCasecmp(str, "ISO646-US"))); -} - -/* * Initialize decoder to translate from any character set known to iconv() * to UTF-8. * @@ -272,8 +254,7 @@ Decode *a_Decode_charset_init(const char *format) if (format && strlen(format) && - dStrAsciiCasecmp(format,"UTF-8") && - !Decode_is_ascii(format)) { + dStrAsciiCasecmp(format,"UTF-8")) { iconv_t ic = iconv_open("UTF-8", format); if (ic != (iconv_t) -1) { |