s3: Remove use of iconv_convenience.

6 files changed, 16 insertions, 16 deletions

diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c
index 2e16b443f0..27d7145375 100644
--- a/source3/registry/reg_api.c
+++ b/source3/registry/reg_api.c
@@ -442,7 +442,7 @@ WERROR reg_queryinfokey(struct registry_key *key, uint32_t *num_subkeys,
 		return err;
 	}
 
-	*secdescsize = ndr_size_security_descriptor(secdesc, NULL, 0);
+	*secdescsize = ndr_size_security_descriptor(secdesc, 0);
 	TALLOC_FREE(mem_ctx);
 
 	*last_changed_time = 0;
diff --git a/source3/registry/reg_backend_printing.c b/source3/registry/reg_backend_printing.c
index e4a90c2e4c..25a7ff7583 100644
--- a/source3/registry/reg_backend_printing.c
+++ b/source3/registry/reg_backend_printing.c
@@ -425,7 +425,7 @@ static void fill_in_printer_values(NT_PRINTER_INFO_LEVEL_2 *info2, struct regval
 		DATA_BLOB blob;
 		enum ndr_err_code ndr_err;
 
-		ndr_err = ndr_push_struct_blob(&blob, values, NULL, devmode,
+		ndr_err = ndr_push_struct_blob(&blob, values, devmode,
 				(ndr_push_flags_fn_t)ndr_push_spoolss_DeviceMode);
 
 		if (NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -579,7 +579,7 @@ static int find_valuename_index( const char *valuename )
 static void pull_reg_sz_fstring(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob, fstring s)
 {
 	const char *str;
-	pull_reg_sz(mem_ctx, NULL, blob, &str);
+	pull_reg_sz(mem_ctx, blob, &str);
 	fstrcpy(s, str);
 }
 
@@ -929,7 +929,7 @@ static void fill_in_driver_values(const struct spoolss_DriverInfo8 *r,
 				break;
 			}
 
-			push_reg_sz(talloc_tos(), NULL, &data, filename);
+			push_reg_sz(talloc_tos(), &data, filename);
 			memcpy( buffer+buffer_size, (char*)data.data, data.length);
 
 			buffer_size += (length + 1)*sizeof(uint16);
diff --git a/source3/registry/reg_eventlog.c b/source3/registry/reg_eventlog.c
index acab5d0848..c2b4a75fa9 100644
--- a/source3/registry/reg_eventlog.c
+++ b/source3/registry/reg_eventlog.c
@@ -117,7 +117,7 @@ bool eventlog_init_keys(void)
 					     sizeof(uint32));
 
 			regval_ctr_addvalue_sz(values, "PrimaryModule", *elogs);
-			push_reg_sz(talloc_tos(), NULL, &data, *elogs);
+			push_reg_sz(talloc_tos(), &data, *elogs);
 
 			regval_ctr_addvalue(values, "Sources", REG_MULTI_SZ,
 					     (char *)data.data,
@@ -129,7 +129,7 @@ bool eventlog_init_keys(void)
 			if (!evtfilepath) {
 				TALLOC_FREE(values);
 			}
-			push_reg_sz(talloc_tos(), NULL, &data, evtfilepath);
+			push_reg_sz(talloc_tos(), &data, evtfilepath);
 			regval_ctr_addvalue(values, "File", REG_EXPAND_SZ, (char *)data.data,
 					     data.length);
 			regdb_store_values(evtlogpath, values);
@@ -162,7 +162,7 @@ bool eventlog_init_keys(void)
 					     REG_DWORD,
 					     ( char * ) &uiCategoryCount,
 					     sizeof( uint32 ) );
-			push_reg_sz(talloc_tos(), NULL, &data,
+			push_reg_sz(talloc_tos(), &data,
 				      "%SystemRoot%\\system32\\eventlog.dll");
 
 			regval_ctr_addvalue( values, "CategoryMessageFile",
@@ -259,7 +259,7 @@ bool eventlog_add_source( const char *eventlog, const char *sourcename,
 	dump_data( 1, rval->data_p, rval->size );
 
 	blob = data_blob_const(rval->data_p, rval->size);
-	if (!pull_reg_multi_sz(talloc_tos(), NULL, &blob, &wrklist)) {
+	if (!pull_reg_multi_sz(talloc_tos(), &blob, &wrklist)) {
 		return false;
 	}
 
@@ -299,7 +299,7 @@ bool eventlog_add_source( const char *eventlog, const char *sourcename,
 		memcpy( wp, wrklist, sizeof( char * ) * numsources );
 		*( wp + numsources ) = ( char * ) sourcename;
 		*( wp + numsources + 1 ) = NULL;
-		if (!push_reg_multi_sz(ctx, NULL, &blob, wp)) {
+		if (!push_reg_multi_sz(ctx, &blob, wp)) {
 			return false;
 		}
 		dump_data( 1, blob.data, blob.length);
diff --git a/source3/registry/reg_objects.c b/source3/registry/reg_objects.c
index 5bc7cd705b..a1d085b586 100644
--- a/source3/registry/reg_objects.c
+++ b/source3/registry/reg_objects.c
@@ -498,7 +498,7 @@ int regval_ctr_addvalue_sz(struct regval_ctr *ctr, const char *name, const char
 {
 	DATA_BLOB blob;
 
-	if (!push_reg_sz(ctr, NULL, &blob, data)) {
+	if (!push_reg_sz(ctr, &blob, data)) {
 		return -1;
 	}
 
@@ -515,7 +515,7 @@ int regval_ctr_addvalue_multi_sz(struct regval_ctr *ctr, const char *name, const
 {
 	DATA_BLOB blob;
 
-	if (!push_reg_multi_sz(ctr, NULL, &blob, data)) {
+	if (!push_reg_multi_sz(ctr, &blob, data)) {
 		return -1;
 	}
 
@@ -608,7 +608,7 @@ const char *regval_sz(struct regval_blob *val)
 	const char *data = NULL;
 	DATA_BLOB blob = data_blob_const(regval_data_p(val), regval_size(val));
 
-	pull_reg_sz(talloc_tos(), NULL, &blob, &data);
+	pull_reg_sz(talloc_tos(), &blob, &data);
 
 	return data;
 }
diff --git a/source3/registry/reg_perfcount.c b/source3/registry/reg_perfcount.c
index 19ff62da30..d71f40ce31 100644
--- a/source3/registry/reg_perfcount.c
+++ b/source3/registry/reg_perfcount.c
@@ -184,7 +184,7 @@ static uint32 _reg_perfcount_multi_sz_from_tdb(TDB_CONTEXT *tdb,
 		buffer_size = 0;
 		return buffer_size;
 	}
-	push_reg_sz(talloc_tos(), NULL, &name_index, (const char *)kbuf.dptr);
+	push_reg_sz(talloc_tos(), &name_index, (const char *)kbuf.dptr);
 	memcpy(buf1+buffer_size, (char *)name_index.data, working_size);
 	buffer_size += working_size;
 	/* Now encode the actual name */
@@ -197,7 +197,7 @@ static uint32 _reg_perfcount_multi_sz_from_tdb(TDB_CONTEXT *tdb,
 	memset(temp, 0, sizeof(temp));
 	memcpy(temp, dbuf.dptr, dbuf.dsize);
 	SAFE_FREE(dbuf.dptr);
-	push_reg_sz(talloc_tos(), NULL, &name, temp);
+	push_reg_sz(talloc_tos(), &name, temp);
 	memcpy(buf1+buffer_size, (char *)name.data, working_size);
 	buffer_size += working_size;
 
diff --git a/source3/registry/regfio.c b/source3/registry/regfio.c
index c6194c4061..1cb453d64f 100644
--- a/source3/registry/regfio.c
+++ b/source3/registry/regfio.c
@@ -1576,7 +1576,7 @@ static uint32 sk_record_data_size( SEC_DESC * sd )
 
 	/* the record size is sizeof(hdr) + name + static members + data_size_field */
 
-	size = sizeof(uint32)*5 + ndr_size_security_descriptor(sd, NULL, 0) + sizeof(uint32);
+	size = sizeof(uint32)*5 + ndr_size_security_descriptor(sd, 0) + sizeof(uint32);
 
 	/* multiple of 8 */
 	size_mod8 = size & 0xfffffff8;
@@ -1806,7 +1806,7 @@ static int hashrec_cmp( REGF_HASH_REC *h1, REGF_HASH_REC *h2 )
 			nk->sec_desc->ref_count = 0;
 			
 			/* size value must be self-inclusive */
-			nk->sec_desc->size      = ndr_size_security_descriptor(sec_desc, NULL, 0)
+			nk->sec_desc->size      = ndr_size_security_descriptor(sec_desc, 0)
 				+ sizeof(uint32);
 
 			DLIST_ADD_END( file->sec_desc_list, nk->sec_desc, REGF_SK_REC *);