lib/util/charset rename iconv_convenience to iconv_handle

[nivanova/samba-autobuild/.git] / source4 / torture / basic / charset.c

diff --git a/source4/torture/basic/charset.c b/source4/torture/basic/charset.c
index 2f50376f87da3751a920c14c0806127a3cb82d67..e4974892c385029c7fcca82bb70c83e1ccbf88b5 100644 (file)
--- a/source4/torture/basic/charset.c
+++ b/source4/torture/basic/charset.c
@@ -20,11 +20,10 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
-#include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
 #include "param/param.h"
+#include "torture/basic/proto.h"
 
 #define BASEDIR "\\chartest\\"
 
@@ -56,7 +55,7 @@ static NTSTATUS unicode_open(struct torture_context *tctx,
        }
        SSVAL(ucs_name, i*2, 0);
 
-       if (!convert_string_talloc_convenience(ucs_name, lp_iconv_convenience(tctx->lp_ctx), CH_UTF16, CH_UNIX, ucs_name, (1+u_name_len)*2, (void **)&fname, &i, false)) {
+       if (!convert_string_talloc_handle(ucs_name, lpcfg_iconv_handle(tctx->lp_ctx), CH_UTF16, CH_UNIX, ucs_name, (1+u_name_len)*2, (void **)&fname, &i)) {
                torture_comment(tctx, "Failed to convert UCS2 Name into unix - convert_string_talloc() failure\n");
                talloc_free(ucs_name);
                return NT_STATUS_NO_MEMORY;
@@ -199,7 +198,7 @@ static bool test_widea(struct torture_context *tctx,
 
 struct torture_suite *torture_charset(TALLOC_CTX *mem_ctx)
 {
-       struct torture_suite *suite = torture_suite_create(mem_ctx, "CHARSET");
+       struct torture_suite *suite = torture_suite_create(mem_ctx, "charset");
 
        torture_suite_add_1smb_test(suite, "Testing composite character (a umlaut)", test_composed); 
        torture_suite_add_1smb_test(suite, "Testing naked diacritical (umlaut)", test_diacritical);