This commit was manufactured by cvs2svn to create tagsamba-1.9.17p3

'release-1-9-17p3'.

1 files changed, 14 insertions, 24 deletions

diff --git a/source/lib/charcnv.c b/source/lib/charcnv.c
index a7dff4224be..6be455c47b2 100644
--- a/source/lib/charcnv.c
+++ b/source/lib/charcnv.c
@@ -107,18 +107,13 @@ char *unix2dos_format(char *str,BOOL overwrite)
     char *dp;
 
     if (!mapsinited) initmaps();
-
-    if(lp_client_code_page() == KANJI_CODEPAGE)
-      return (*_unix_to_dos)(str, overwrite);
-    else {
-      if (overwrite) {
-          for (p = str; *p; p++) *p = unix2dos[(unsigned char)*p];
-          return str;
-      } else {
-          for (p = str, dp = cvtbuf; *p; p++,dp++) *dp = unix2dos[(unsigned char)*p];
-          *dp = 0;
-          return cvtbuf;
-      }
+    if (overwrite) {
+        for (p = str; *p; p++) *p = unix2dos[(unsigned char)*p];
+        return str;
+    } else {
+        for (p = str, dp = cvtbuf; *p; p++,dp++) *dp = unix2dos[(unsigned char)*p];
+        *dp = 0;
+        return cvtbuf;
     }
 }
 
@@ -131,18 +126,13 @@ char *dos2unix_format(char *str, BOOL overwrite)
     char *dp;
 
     if (!mapsinited) initmaps();
-
-    if(lp_client_code_page() == KANJI_CODEPAGE)
-      return (*_dos_to_unix)(str, overwrite);
-    else {
-      if (overwrite) {
-          for (p = str; *p; p++) *p = dos2unix[(unsigned char)*p];
-          return str;
-      } else {
-          for (p = str, dp = cvtbuf; *p; p++,dp++) *dp = dos2unix[(unsigned char)*p];
-          *dp = 0;
-          return cvtbuf;
-      }
+    if (overwrite) {
+        for (p = str; *p; p++) *p = dos2unix[(unsigned char)*p];
+        return str;
+    } else {
+        for (p = str, dp = cvtbuf; *p; p++,dp++) *dp = dos2unix[(unsigned char)*p];
+        *dp = 0;
+        return cvtbuf;
     }
 }