diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-05-09 17:20:01 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-05-18 11:45:30 +0200 |
| commit | f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d (patch) | |
| tree | 9a0a6cb6617d855c28eb891396898096c4214e88 /pidl/tests | |
| parent | e9f5bdf6b5a1aeb7e2e556cf41f7cbc2abed7856 (diff) | |
| download | samba-f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d.tar.gz samba-f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d.tar.bz2 samba-f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d.zip | |
Finish removal of iconv_convenience in public API's.
Diffstat (limited to 'pidl/tests')
| -rwxr-xr-x | pidl/tests/ndr_string.pl | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/pidl/tests/ndr_string.pl b/pidl/tests/ndr_string.pl index e00dd01c8e..8e8b8ecbad 100755 --- 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; |