From 9b0df441e1bd836c433e11582650fa0171791485 Mon Sep 17 00:00:00 2001 From: Tim Prouty Date: Sun, 1 Mar 2009 13:58:46 -0800 Subject: s3: Fix incompatible type warnings --- source3/lib/util_reg_api.c | 2 +- source3/libgpo/gpo_ini.c | 2 +- source3/rpc_server/srv_eventlog_lib.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source3/lib/util_reg_api.c b/source3/lib/util_reg_api.c index 8f28e9c282..9313193f10 100644 --- a/source3/lib/util_reg_api.c +++ b/source3/lib/util_reg_api.c @@ -92,7 +92,7 @@ WERROR registry_pull_value(TALLOC_CTX *mem_ctx, } if (!convert_string_talloc(value, CH_UTF16LE, CH_UNIX, tmp, - length+2, &value->v.sz.str, + length+2, (void **)&value->v.sz.str, &value->v.sz.len, False)) { SAFE_FREE(tmp); err = WERR_INVALID_PARAM; diff --git a/source3/libgpo/gpo_ini.c b/source3/libgpo/gpo_ini.c index aa8f7c7770..edca85530b 100644 --- a/source3/libgpo/gpo_ini.c +++ b/source3/libgpo/gpo_ini.c @@ -83,7 +83,7 @@ static NTSTATUS convert_file_from_ucs2(TALLOC_CTX *mem_ctx, } if (!convert_string_talloc(mem_ctx, CH_UTF16LE, CH_UNIX, data_in, n, - &data_out, &converted_size, False)) + (void **)&data_out, &converted_size, False)) { status = NT_STATUS_INVALID_BUFFER_SIZE; goto out; diff --git a/source3/rpc_server/srv_eventlog_lib.c b/source3/rpc_server/srv_eventlog_lib.c index edd1cfacb8..f83c4fc3b8 100644 --- a/source3/rpc_server/srv_eventlog_lib.c +++ b/source3/rpc_server/srv_eventlog_lib.c @@ -936,7 +936,7 @@ NTSTATUS evlog_tdb_entry_to_evt_entry(TALLOC_CTX *mem_ctx, size_t len; if (!convert_string_talloc(mem_ctx, CH_UTF16, CH_UNIX, t->sid.data, t->sid.length, - &sid_str, &len, false)) { + (void **)&sid_str, &len, false)) { return NT_STATUS_INVALID_SID; } if (len > 0) { -- cgit