From 63b111bd329fddaf0bfd64ca8255deecb1fd5352 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 9 Apr 2010 16:47:45 +0200 Subject: s3: add iconv_convenience handle to pull/push sz helpers. Guenther --- source3/registry/reg_backend_printing.c | 4 ++-- source3/registry/reg_eventlog.c | 10 +++++----- source3/registry/reg_objects.c | 6 +++--- source3/registry/reg_perfcount.c | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'source3/registry') diff --git a/source3/registry/reg_backend_printing.c b/source3/registry/reg_backend_printing.c index 26227b547e..7383ce66bd 100644 --- a/source3/registry/reg_backend_printing.c +++ b/source3/registry/reg_backend_printing.c @@ -578,7 +578,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, blob, &str); + pull_reg_sz(mem_ctx, NULL, blob, &str); fstrcpy(s, str); } @@ -927,7 +927,7 @@ static void fill_in_driver_values(const struct spoolss_DriverInfo8 *r, break; } - push_reg_sz(talloc_tos(), &data, filename); + push_reg_sz(talloc_tos(), NULL, &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 722cd58f69..7a277e2032 100644 --- a/source3/registry/reg_eventlog.c +++ b/source3/registry/reg_eventlog.c @@ -116,7 +116,7 @@ bool eventlog_init_keys(void) sizeof(uint32)); regval_ctr_addvalue_sz(values, "PrimaryModule", *elogs); - push_reg_sz(talloc_tos(), &data, *elogs); + push_reg_sz(talloc_tos(), NULL, &data, *elogs); regval_ctr_addvalue(values, "Sources", REG_MULTI_SZ, (char *)data.data, @@ -128,7 +128,7 @@ bool eventlog_init_keys(void) if (!evtfilepath) { TALLOC_FREE(values); } - push_reg_sz(talloc_tos(), &data, evtfilepath); + push_reg_sz(talloc_tos(), NULL, &data, evtfilepath); regval_ctr_addvalue(values, "File", REG_EXPAND_SZ, (char *)data.data, data.length); regdb_store_values(evtlogpath, values); @@ -161,7 +161,7 @@ bool eventlog_init_keys(void) REG_DWORD, ( char * ) &uiCategoryCount, sizeof( uint32 ) ); - push_reg_sz(talloc_tos(), &data, + push_reg_sz(talloc_tos(), NULL, &data, "%SystemRoot%\\system32\\eventlog.dll"); regval_ctr_addvalue( values, "CategoryMessageFile", @@ -258,7 +258,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(), &blob, &wrklist)) { + if (!pull_reg_multi_sz(talloc_tos(), NULL, &blob, &wrklist)) { return false; } @@ -298,7 +298,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, &blob, wp)) { + if (!push_reg_multi_sz(ctx, NULL, &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 b4b8ff2630..a07e36157e 100644 --- a/source3/registry/reg_objects.c +++ b/source3/registry/reg_objects.c @@ -497,7 +497,7 @@ int regval_ctr_addvalue_sz(struct regval_ctr *ctr, const char *name, const char { DATA_BLOB blob; - if (!push_reg_sz(ctr, &blob, data)) { + if (!push_reg_sz(ctr, NULL, &blob, data)) { return -1; } @@ -514,7 +514,7 @@ int regval_ctr_addvalue_multi_sz(struct regval_ctr *ctr, const char *name, const { DATA_BLOB blob; - if (!push_reg_multi_sz(ctr, &blob, data)) { + if (!push_reg_multi_sz(ctr, NULL, &blob, data)) { return -1; } @@ -607,7 +607,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(), &blob, &data); + pull_reg_sz(talloc_tos(), NULL, &blob, &data); return data; } diff --git a/source3/registry/reg_perfcount.c b/source3/registry/reg_perfcount.c index 1991af10ca..ff9e5db46c 100644 --- a/source3/registry/reg_perfcount.c +++ b/source3/registry/reg_perfcount.c @@ -182,7 +182,7 @@ static uint32 _reg_perfcount_multi_sz_from_tdb(TDB_CONTEXT *tdb, buffer_size = 0; return buffer_size; } - push_reg_sz(talloc_tos(), &name_index, (const char *)kbuf.dptr); + push_reg_sz(talloc_tos(), NULL, &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 */ @@ -195,7 +195,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(), &name, temp); + push_reg_sz(talloc_tos(), NULL, &name, temp); memcpy(buf1+buffer_size, (char *)name.data, working_size); buffer_size += working_size; -- cgit