From 87fbb7092b8f8b2f0db0f361c3d625e19de57cd9 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 4 Jul 2001 07:15:53 +0000
Subject: The big character set handling changeover!

This commit gets rid of all our old codepage handling and replaces it with
iconv. All internal strings in Samba are now in "unix" charset, which may
be multi-byte. See internals.doc and my posting to samba-technical for
a more complete explanation.
(This used to be commit debb471267960e56005a741817ebd227ecfc512a)
---
 source3/torture/locktest.c   | 2 --
 source3/torture/locktest2.c  | 2 --
 source3/torture/masktest.c   | 2 --
 source3/torture/msgtest.c    | 2 --
 source3/torture/rpctorture.c | 3 ---
 source3/torture/torture.c    | 6 ------
 6 files changed, 17 deletions(-)

(limited to 'source3/torture')

diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c
index ef6c9a978ac..2eaa6057c65 100644
--- a/source3/torture/locktest.c
+++ b/source3/torture/locktest.c
@@ -510,8 +510,6 @@ static void usage(void)
 	argv += NSERVERS;
 
 	TimeInit();
-	charset_initialise();
-	codepage_initialise(lp_client_code_page());
 
 	lp_load(servicesf,True,False,False);
 	load_interfaces();
diff --git a/source3/torture/locktest2.c b/source3/torture/locktest2.c
index 0391aa29426..171386dec3a 100644
--- a/source3/torture/locktest2.c
+++ b/source3/torture/locktest2.c
@@ -563,8 +563,6 @@ static void usage(void)
 	argv += 4;
 
 	TimeInit();
-	charset_initialise();
-	codepage_initialise(lp_client_code_page());
 
 	lp_load(servicesf,True,False,False);
 	load_interfaces();
diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c
index a654b5bfd11..a10a4e954c9 100644
--- a/source3/torture/masktest.c
+++ b/source3/torture/masktest.c
@@ -445,8 +445,6 @@ static void usage(void)
 	argv += 1;
 
 	TimeInit();
-	charset_initialise();
-	codepage_initialise(lp_client_code_page());
 
 	lp_load(servicesf,True,False,False);
 	load_interfaces();
diff --git a/source3/torture/msgtest.c b/source3/torture/msgtest.c
index 3fbf95af8fa..f08d7228038 100644
--- a/source3/torture/msgtest.c
+++ b/source3/torture/msgtest.c
@@ -46,8 +46,6 @@ void pong_message(int msg_type, pid_t src, void *buf, size_t len)
 	TimeInit();
 	setup_logging(argv[0],True);
 	
-	charset_initialise();
-
 	lp_load(servicesf,False,False,False);
 
 	message_init();
diff --git a/source3/torture/rpctorture.c b/source3/torture/rpctorture.c
index c80cfe4adea..b42c315b1db 100644
--- a/source3/torture/rpctorture.c
+++ b/source3/torture/rpctorture.c
@@ -258,8 +258,6 @@ enum client_action
 		fprintf(stderr, "Can't load %s - run testparm to debug it\n", servicesf);
 	}
 
-	codepage_initialise(lp_client_code_page());
-
 	DEBUGLEVEL = 0;
 
 	cli_info.put_total_size = 0;
@@ -303,7 +301,6 @@ enum client_action
 	setup_logging(pname, True);
 
 	TimeInit();
-	charset_initialise();
 
 	myumask = umask(0);
 	umask(myumask);
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 2cad5cd13a8..a7c50fbfe0f 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -3217,12 +3217,6 @@ static void usage(void)
 	setbuffer(stdout, NULL, 0);
 #endif
 
-	charset_initialise();
-
-	codepage_initialise(lp_client_code_page());
-
-	codepage_initialise(lp_client_code_page());
-
 	lp_load(servicesf,True,False,False);
 	load_interfaces();
 
-- 
cgit