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 0ae7f6036b4ec10227953fabe1ae91488e84f08b..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\\"
 
@@ -42,7 +41,7 @@ static NTSTATUS unicode_open(struct torture_context *tctx,
 {
        union smb_open io;
        char *fname, *fname2=NULL, *ucs_name;
-       int i;
+       size_t i;
        NTSTATUS status;
 
        ucs_name = talloc_size(mem_ctx, (1+u_name_len)*2);
@@ -56,8 +55,7 @@ static NTSTATUS unicode_open(struct torture_context *tctx,
        }
        SSVAL(ucs_name, i*2, 0);
 
-       i = 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);
-       if (i == -1) {
+       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;
@@ -71,7 +69,7 @@ static NTSTATUS unicode_open(struct torture_context *tctx,
 
        io.generic.level = RAW_OPEN_NTCREATEX;
        io.ntcreatex.in.flags = NTCREATEX_FLAGS_EXTENDED;
-       io.ntcreatex.in.root_fid = 0;
+       io.ntcreatex.in.root_fid.fnum = 0;
        io.ntcreatex.in.access_mask = SEC_RIGHTS_FILE_ALL;
        io.ntcreatex.in.alloc_size = 0;
        io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_NORMAL;
@@ -200,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);