From 8d7c88667190fe286971ac4fffb64ee5bd9eeeb0 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 18 Oct 2005 03:24:00 +0000 Subject: r11137: Compile with only 2 warnings (I'm still working on that code) on a gcc4 x86_64 box. Jeremy. (This used to be commit d720867a788c735e56d53d63265255830ec21208) --- source3/registry/reg_eventlog.c | 2 +- source3/registry/reg_perfcount.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/registry') diff --git a/source3/registry/reg_eventlog.c b/source3/registry/reg_eventlog.c index 69d8f2f9aa..61c73abd4b 100644 --- a/source3/registry/reg_eventlog.c +++ b/source3/registry/reg_eventlog.c @@ -226,7 +226,7 @@ BOOL eventlog_add_source( const char *eventlog, const char *sourcename, already_in = False; wrklist = NULL; - dump_data( 1, rval->data_p, rval->size ); + dump_data( 1, (const char *)rval->data_p, rval->size ); if ( ( numsources = regval_convert_multi_sz( ( uint16 * ) rval->data_p, rval->size, &wrklist ) ) > 0 ) { diff --git a/source3/registry/reg_perfcount.c b/source3/registry/reg_perfcount.c index 609f86da6c..fe8b355b95 100644 --- a/source3/registry/reg_perfcount.c +++ b/source3/registry/reg_perfcount.c @@ -872,10 +872,10 @@ static uint32 _reg_perfcount_perf_data_block_fixup(PERF_DATA_BLOCK *block, prs_s counter_data->ByteLength = counter->CounterOffset + counter->CounterSize + sizeof(counter_data->ByteLength); temp = TALLOC_REALLOC_ARRAY(ps->mem_ctx, temp, - uint8, + char, counter_data->ByteLength- sizeof(counter_data->ByteLength)); memset(temp, 0, counter_data->ByteLength - sizeof(counter_data->ByteLength)); - src_addr = counter_data->data; + src_addr = (char *)counter_data->data; for(i = 0; i < object[obj].NumCounters; i++) { counter = &(object[obj].counters[i]); -- cgit