Finish removal of iconv_convenience in public API's.

[amitay/samba.git] / pidl / tests / ndr_string.pl

diff --git a/pidl/tests/ndr_string.pl b/pidl/tests/ndr_string.pl
index e00dd01c8e26a63119828116f1fe453094855123..8e8b8ecbad6c46f4ff428549b67381f60f1dd307 100755 (executable)
--- a/pidl/tests/ndr_string.pl
+++ b/pidl/tests/ndr_string.pl
@@ -14,8 +14,7 @@ test_samba4_ndr("string-pull-empty",
 '
        uint8_t data[] = { 0x00, 0x00, 0x00, 0x00 };
        DATA_BLOB b = { data, 4 };
-       struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL, 
-               smb_iconv_convenience_reinit(NULL, "ASCII", "UTF8", true, NULL));
+       struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL);
        struct TestString r;
        r.in.data = NULL;
 
@@ -37,8 +36,7 @@ test_samba4_ndr("string-ascii-pull",
        uint8_t data[] = { 0x03, 0x00, 0x00, 0x00, 
                                           \'f\', \'o\', \'o\', 0 };
        DATA_BLOB b = { data, 8 };
-       struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL,
-               smb_iconv_convenience_reinit(NULL, "ASCII", "UTF8", true, NULL));
+       struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL);
        struct TestString r;
        r.in.data = NULL;
 
@@ -74,8 +72,7 @@ test_samba4_ndr("string-wchar-fixed-array-01",
                           0x02,  0x00, 0x00,  0x00
        };
        DATA_BLOB b = { data, sizeof(data) };
-       struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL,
-               smb_iconv_convenience_reinit(NULL, "ASCII", "UTF8", true, NULL));
+       struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL);
        struct TestString r;
        struct TestStringStruct str;
        r.in.str = &str;
@@ -120,8 +117,7 @@ test_samba4_ndr("string-wchar-fixed-array-02",
                           0x02,  0x00, 0x00,  0x00
        };
        DATA_BLOB b = { data, sizeof(data) };
-       struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL,
-               smb_iconv_convenience_reinit(NULL, "ASCII", "UTF8", true, NULL));
+       struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL);
        struct TestString r;
        struct TestStringStruct str;
        r.in.str = &str;
@@ -152,8 +148,7 @@ test_samba4_ndr("string-wchar-fixed-array-03",
                           0x02,  0x00, 0x00,  0x00
        };
        DATA_BLOB b = { data, sizeof(data) };
-       struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL,
-               smb_iconv_convenience_reinit(NULL, "ASCII", "UTF8", true, NULL));
+       struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL);
        struct TestString r;
        struct TestStringStruct str;
        r.in.str = &str;
@@ -174,8 +169,7 @@ test_samba4_ndr("string-out",
        uint8_t data[] = { 0x03, 0x00, 0x00, 0x00, 
                                           \'f\', \'o\', \'o\', 0 };
        DATA_BLOB b = { data, 8 };
-       struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL,
-               smb_iconv_convenience_reinit(NULL, "ASCII", "UTF8", true, NULL));
+       struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL);
        struct TestString r;
        char *str = NULL;
        r.out.data = &str;