Finish removal of iconv_convenience in public API's.

3 files changed, 12 insertions, 18 deletions

diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index 4c23dfacd8..83bca288ed 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -1618,7 +1618,7 @@ sub ParseStructNdrSize($$$$)
 	if (my $flags = has_property($t, "flag")) {
 		$self->pidl("flags |= $flags;");
 	}
-	$self->pidl("return ndr_size_struct($varname, flags, (ndr_push_flags_fn_t)ndr_push_$name, ic);");
+	$self->pidl("return ndr_size_struct($varname, flags, (ndr_push_flags_fn_t)ndr_push_$name);");
 }
 
 sub DeclStruct($$$$)
@@ -1630,7 +1630,7 @@ sub DeclStruct($$$$)
 sub ArgsStructNdrSize($$$)
 {
 	my ($d, $name, $varname) = @_;
-	return "const struct $name *$varname, struct smb_iconv_convenience *ic, int flags";
+	return "const struct $name *$varname, int flags";
 }
 
 $typefamily{STRUCT} = {
@@ -1653,7 +1653,7 @@ sub ParseUnionNdrSize($$$)
 		$self->pidl("flags |= $flags;");
 	}
 
-	$self->pidl("return ndr_size_union($varname, flags, level, (ndr_push_flags_fn_t)ndr_push_$name, ic);");
+	$self->pidl("return ndr_size_union($varname, flags, level, (ndr_push_flags_fn_t)ndr_push_$name);");
 }
 
 sub ParseUnionPushPrimitives($$$$)
@@ -1941,7 +1941,7 @@ sub DeclUnion($$$$)
 sub ArgsUnionNdrSize($$)
 {
 	my ($d,$name) = @_;
-	return "const union $name *r, uint32_t level, struct smb_iconv_convenience *ic, int flags";
+	return "const union $name *r, uint32_t level, int flags";
 }
 
 $typefamily{UNION} = {
diff --git a/pidl/lib/Parse/Pidl/Samba4/Python.pm b/pidl/lib/Parse/Pidl/Samba4/Python.pm
index 226db078d6..390ee27510 100644
--- a/pidl/lib/Parse/Pidl/Samba4/Python.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/Python.pm
@@ -253,7 +253,7 @@ sub PythonStruct($$$$$$)
 		$self->pidl("$cname *object = ($cname *)py_talloc_get_ptr(py_obj);");
 		$self->pidl("DATA_BLOB blob;");
 		$self->pidl("enum ndr_err_code err;");
-		$self->pidl("err = ndr_push_struct_blob(&blob, py_talloc_get_mem_ctx(py_obj), NULL, object, (ndr_push_flags_fn_t)ndr_push_$name);");
+		$self->pidl("err = ndr_push_struct_blob(&blob, py_talloc_get_mem_ctx(py_obj), object, (ndr_push_flags_fn_t)ndr_push_$name);");
 		$self->pidl("if (err != NDR_ERR_SUCCESS) {");
 		$self->indent;
 		$self->pidl("PyErr_SetNdrError(err);");
@@ -275,7 +275,7 @@ sub PythonStruct($$$$$$)
 		$self->pidl("if (!PyArg_ParseTuple(args, \"s#:__ndr_unpack__\", &blob.data, &blob.length))");
 		$self->pidl("\treturn NULL;");
 		$self->pidl("");
-		$self->pidl("err = ndr_pull_struct_blob_all(&blob, py_talloc_get_mem_ctx(py_obj), NULL, object, (ndr_pull_flags_fn_t)ndr_pull_$name);");
+		$self->pidl("err = ndr_pull_struct_blob_all(&blob, py_talloc_get_mem_ctx(py_obj), object, (ndr_pull_flags_fn_t)ndr_pull_$name);");
 		$self->pidl("if (err != NDR_ERR_SUCCESS) {");
 		$self->indent;
 		$self->pidl("PyErr_SetNdrError(err);");
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;