From b8268cf7b0264ea28f684cbdfbf462e68a018d83 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 10 May 2010 00:42:06 +0200 Subject: s3: Remove use of iconv_convenience. --- source3/registry/reg_eventlog.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source3/registry/reg_eventlog.c') 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); -- cgit