Mercurial > dovecot > original-hg > dovecot-1.2

changeset 5502:212bbdc55065 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanup
author Timo Sirainen <tss@iki.fi>
date Tue, 03 Apr 2007 13:13:10 +0300
parents e9745c1c4d14
children b7573b83f999
files src/lib-charset/charset-iconv.c
diffstat 1 files changed, 2 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-charset/charset-iconv.c	Tue Apr 03 12:58:04 2007 +0300
+++ b/src/lib-charset/charset-iconv.c	Tue Apr 03 13:13:10 2007 +0300
@@ -11,7 +11,6 @@
 
 struct charset_translation {
 	iconv_t cd;
-	bool ascii;
 };
 
 struct charset_translation *charset_to_utf8_begin(const char *charset,
@@ -19,21 +18,13 @@
 {
 	struct charset_translation *t;
 	iconv_t cd;
-	bool ascii;
 
 	if (unknown_charset != NULL)
 		*unknown_charset = FALSE;
 
-	if (strcasecmp(charset, "us-ascii") == 0 ||
-	    strcasecmp(charset, "ascii") == 0) {
+	if (charset_is_utf8(charset))
 		cd = (iconv_t)-1;
-		ascii = TRUE;
-	} else if (strcasecmp(charset, "UTF-8") == 0 ||
-		   strcasecmp(charset, "UTF8") == 0) {
-		cd = (iconv_t)-1;
-		ascii = FALSE;
-	} else {
-		ascii = FALSE;
+	else {
 		cd = iconv_open("UTF-8", charset);
 		if (cd == (iconv_t)-1) {
 			if (unknown_charset != NULL)
@@ -44,7 +35,6 @@
 
 	t = i_new(struct charset_translation, 1);
 	t->cd = cd;
-	t->ascii = ascii;
 	return t;
 }