From: bfernhomberg <bfernhomberg>
Date: Wed, 26 Nov 2003 03:23:32 +0000 (+0000)
Subject: fix typos, minor cleanup
X-Git-Tag: netatalk-2-0-alpha1~61
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=ea29e05fa2bab2c6b9578616bc9a4dab2db6ed61

fix typos, minor cleanup
---

diff --git a/libatalk/unicode/charcnv.c b/libatalk/unicode/charcnv.c
index 157b9220..082d5550 100644
--- a/libatalk/unicode/charcnv.c
+++ b/libatalk/unicode/charcnv.c
@@ -201,16 +201,6 @@ void init_iconv(void)
 {
 	int c1;
 
-	/* so that charset_name() works we need to get the UNIX<->UCS2 going
-	   first */
-#if 0
-	if (!conv_handles[CH_UNIX][CH_UCS2])
-		conv_handles[CH_UNIX][CH_UCS2] = atalk_iconv_open("UCS-2", "ASCII");
-
-	if (!conv_handles[CH_UCS2][CH_UNIX])
-		conv_handles[CH_UCS2][CH_UNIX] = atalk_iconv_open("ASCII", "UCS-2");
-#endif
-
 	for (c1=0;c1<NUM_CHARSETS;c1++) {
 		const char *name = charset_name((charset_t)c1);
 
@@ -222,10 +212,10 @@ void init_iconv(void)
 		}
 
 		conv_handles[CH_UCS2][c1] = atalk_iconv_open( name, charset_name(CH_UCS2));
-        	if (conv_handles[CH_UCS2][1] == (atalk_iconv_t)-1) {
+        	if (conv_handles[CH_UCS2][c1] == (atalk_iconv_t)-1) {
 			LOG(log_error, logtype_default, "Required conversion from %s to %s not supported",
 				charset_name(CH_UCS2), name);
-			conv_handles[c1][c1] = NULL;
+			conv_handles[CH_UCS2][c1] = NULL;
 		}
 		
 		charsets[c1] = get_charset_functions (c1);