Changeset 337 for branches/samba-3.0/source/lib/charcnv.c

Timestamp:

Oct 8, 2009, 8:01:00 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

divers fix for Ticket #68 in 3.0

File:

• branches/samba-3.0/source/lib/charcnv.c (modified) (9 diffs)

branches/samba-3.0/source/lib/charcnv.c

@@ -56 +56 @@
 {
         const char *ret = NULL;
-#ifndef __OS2__
         if (ch == CH_UTF16LE) ret = "UTF-16LE";
         else if (ch == CH_UTF16BE) ret = "UTF-16BE";
-#else
-        if (ch == CH_UTF16LE) ret = "IBM-1200";
-        else if (ch == CH_UTF16BE) ret = "IBM-1200";
-#endif
         else if (ch == CH_UNIX) ret = lp_unix_charset();
         else if (ch == CH_DOS) ret = lp_dos_charset();
@@ -93 +88 @@
 
         if (!ret || !*ret) ret = "ASCII";
-        DEBUG(10, ("codepage: %s\n",ret));
         return ret;
 }
@@ -397 +391 @@
                 return 0;
 
-//      DEBUG(10, ("convert_string: 1"));
-
         if (from != CH_UTF16LE && from != CH_UTF16BE && to != CH_UTF16LE && to != CH_UTF16BE) {
                 const unsigned char *p = (const unsigned char *)src;
@@ -406 +398 @@
                 unsigned char lastp = '\0';
                 size_t retval = 0;
-
-//      DEBUG(10, ("convert_string: 2"));
 
                 /* If all characters are ascii, fast path here. */
@@ -436 +426 @@
                 }
                 return retval;
-//              DEBUG(10, ("convert_string: 3"));
 
         } else if (from == CH_UTF16LE && to != CH_UTF16LE) {
@@ -462 +451 @@
                                 goto general_case;
 #else
-                                return retval + convert_string_internal(from, to, p, slen, q, dlen, allow_bad_conv);
+                return retval + convert_string_internal(from, to, p, slen, q, dlen, allow_bad_conv);
 #endif
                         }
@@ -474 +463 @@
                 }
                 return retval;
-//              DEBUG(10, ("convert_string: 4"));
 
         } else if (from != CH_UTF16LE && from != CH_UTF16BE && to == CH_UTF16LE) {
@@ -517 +505 @@
   general_case:
 #endif
+
         return convert_string_internal(from, to, src, srclen, dest, destlen, allow_bad_conv);
 }
@@ -593 +582 @@
 
  again:
-        DEBUG(10,("convert_string_internal: convert_string(%s,%s): srclen=%u destlen=%u\n",
-        charset_name(from), charset_name(to),
-        (unsigned int)srclen, (unsigned int)destlen));
 
         retval = smb_iconv(descriptor,