From: didg <didg>
Date: Sat, 7 Nov 2009 17:25:33 +0000 (+0000)
Subject: remove redundant lazy_initialize_conv calls
X-Git-Tag: branch-symlink-start~169
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=dd19abe6f6eb9a38b45fb72dad995b283691b5d9;p=netatalk.git

remove redundant lazy_initialize_conv calls
---

diff --git a/libatalk/unicode/charcnv.c b/libatalk/unicode/charcnv.c
index d592f9eb..8522dbb7 100644
--- a/libatalk/unicode/charcnv.c
+++ b/libatalk/unicode/charcnv.c
@@ -369,8 +369,6 @@ size_t convert_string(charset_t from, charset_t to,
     ucs2_t buffer2[MAXPATHLEN];
     int composition = 0;
 
-    lazy_initialize_conv();
-
     /* convert from_set to UCS2 */
     if ((size_t)(-1) == ( o_len = convert_string_internal( from, CH_UCS2, src, srclen,
                                                            (char*) buffer, sizeof(buffer))) ) {
@@ -519,8 +517,6 @@ size_t convert_string_allocate(charset_t from, charset_t to,
     ucs2_t buffer2[MAXPATHLEN];
     int composition = 0;
 
-    lazy_initialize_conv();
-
     *dest = NULL;
 
     /* convert from_set to UCS2 */
@@ -806,8 +802,6 @@ static size_t pull_charset_flags (charset_t from_set, charset_t cap_set, const c
     if (srclen == (size_t)-1)
         srclen = strlen(src) + 1;
 
-    lazy_initialize_conv();
-
     descriptor = conv_handles[from_set][CH_UCS2];
     descriptor_cap = conv_handles[cap_set][CH_UCS2];
 
@@ -917,8 +911,6 @@ static size_t push_charset_flags (charset_t to_set, charset_t cap_set, char* src
     atalk_iconv_t descriptor;
     atalk_iconv_t descriptor_cap;
 
-    lazy_initialize_conv();
-
     descriptor = conv_handles[CH_UCS2][to_set];
     descriptor_cap = conv_handles[CH_UCS2][cap_set];