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/rpcclient/cmd_eventlog.c | 2 +- source3/rpcclient/cmd_spoolss.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/rpcclient') diff --git a/source3/rpcclient/cmd_eventlog.c b/source3/rpcclient/cmd_eventlog.c index 3acaf0ca83..941909ed54 100644 --- a/source3/rpcclient/cmd_eventlog.c +++ b/source3/rpcclient/cmd_eventlog.c @@ -135,7 +135,7 @@ static NTSTATUS cmd_eventlog_readlog(struct rpc_pipe_client *cli, blob = data_blob_const(data + pos, size); /* dump_data(0, blob.data, blob.length); */ - ndr_err = ndr_pull_struct_blob_all(&blob, mem_ctx, NULL, &r, + ndr_err = ndr_pull_struct_blob_all(&blob, mem_ctx, &r, (ndr_pull_flags_fn_t)ndr_pull_EVENTLOGRECORD); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { status = ndr_map_error2ntstatus(ndr_err); diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c index 9ab02b5a97..e3ad97c713 100644 --- a/source3/rpcclient/cmd_spoolss.c +++ b/source3/rpcclient/cmd_spoolss.c @@ -739,7 +739,7 @@ static void display_reg_value(struct regval_blob value) break; case REG_SZ: blob = data_blob_const(value.data_p, value.size); - pull_reg_sz(talloc_tos(), NULL, &blob, &text); + pull_reg_sz(talloc_tos(), &blob, &text); printf("%s: REG_SZ: %s\n", value.valuename, text ? text : ""); break; case REG_BINARY: { @@ -765,7 +765,7 @@ static void display_reg_value(struct regval_blob value) const char **values; blob = data_blob_const(value.data_p, value.size); - if (!pull_reg_multi_sz(NULL, NULL, &blob, &values)) { + if (!pull_reg_multi_sz(NULL, &blob, &values)) { d_printf("pull_reg_multi_sz failed\n"); break; } -- cgit