remove '\n' char in log messages.

[netatalk.git] / libatalk / unicode / charcnv.c

diff --git a/libatalk/unicode/charcnv.c b/libatalk/unicode/charcnv.c
index 082d5550379bfdb6fa0185ed9a7fddd6030e33c5..539f9a863ee71363af1b8c604e639cee14c61179 100644 (file)
--- a/libatalk/unicode/charcnv.c
+++ b/libatalk/unicode/charcnv.c
@@ -211,11 +211,13 @@ void init_iconv(void)
                        conv_handles[c1][CH_UCS2] = NULL;
                }
 
-               conv_handles[CH_UCS2][c1] = atalk_iconv_open( name, charset_name(CH_UCS2));
-               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[CH_UCS2][c1] = NULL;
+               if (c1 != CH_UCS2) { /* avoid lost memory, make valgrind happy */
+                       conv_handles[CH_UCS2][c1] = atalk_iconv_open( name, charset_name(CH_UCS2));
+                       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[CH_UCS2][c1] = NULL;
+                       }
                }
                
                charsets[c1] = get_charset_functions (c1);
@@ -373,7 +375,7 @@ static size_t convert_string_allocate_internal(charset_t from, charset_t to,
 
        if (descriptor == (atalk_iconv_t)-1 || descriptor == (atalk_iconv_t)0) {
                /* conversion not supported, return -1*/
-               LOG(log_debug, logtype_default, "convert_string_allocate: conversion not supported!\n");
+               LOG(log_debug, logtype_default, "convert_string_allocate: conversion not supported!");
                return -1;
        }
 
@@ -382,7 +384,7 @@ convert:
        destlen = destlen * 2;
        ob = (char *)realloc(ob, destlen);
        if (!ob) {
-               LOG(log_debug, logtype_default,"convert_string_allocate: realloc failed!\n");
+               LOG(log_debug, logtype_default,"convert_string_allocate: realloc failed!");
                SAFE_FREE(outbuf);
                return (size_t)-1;
        } else {
@@ -428,7 +430,7 @@ convert:
        }
 
        if (destlen && !*dest) {
-               LOG(log_debug, logtype_default, "convert_string_allocate: out of memory!\n");
+               LOG(log_debug, logtype_default, "convert_string_allocate: out of memory!");
                SAFE_FREE(ob);
                return (size_t)-1;
        }
@@ -992,12 +994,10 @@ size_t convert_charset ( charset_t from_set, charset_t to_set, charset_t cap_cha
                
        /* Do case conversions */       
        if (CHECK_FLAGS(flags, CONV_TOUPPER)) {
-           if (!strupper_w(u)) 
-               return (size_t)(-1);
+           strupper_w(u);
        }
        if (CHECK_FLAGS(flags, CONV_TOLOWER)) {
-           if (!strlower_w(u)) 
-               return (size_t)(-1);
+           strlower_w(u);
        }
 
        /* Convert UCS2 to to_set */