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/utils/net_eventlog.c | 6 +++--- source3/utils/net_rpc_printer.c | 12 ++++++------ source3/utils/net_rpc_registry.c | 4 ++-- source3/utils/net_rpc_service.c | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'source3/utils') diff --git a/source3/utils/net_eventlog.c b/source3/utils/net_eventlog.c index 28a010c5a7..24dbab97ca 100644 --- a/source3/utils/net_eventlog.c +++ b/source3/utils/net_eventlog.c @@ -55,7 +55,7 @@ static int net_eventlog_dump(struct net_context *c, int argc, goto done; } - ndr_err = ndr_pull_struct_blob(&blob, ctx, NULL, &evt, + ndr_err = ndr_pull_struct_blob(&blob, ctx, &evt, (ndr_pull_flags_fn_t)ndr_pull_EVENTLOG_EVT_FILE); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { d_fprintf(stderr, _("evt pull failed: %s\n"), @@ -113,7 +113,7 @@ static int net_eventlog_import(struct net_context *c, int argc, } /* dump_data(0, blob.data, blob.length); */ - ndr_err = ndr_pull_struct_blob(&blob, ctx, NULL, &evt_header, + ndr_err = ndr_pull_struct_blob(&blob, ctx, &evt_header, (ndr_pull_flags_fn_t)ndr_pull_EVENTLOGHEADER); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { d_fprintf(stderr, _("evt header pull failed: %s\n"), @@ -126,7 +126,7 @@ static int net_eventlog_import(struct net_context *c, int argc, goto done; } - ndr_err = ndr_pull_struct_blob(&blob, ctx, NULL, &evt, + ndr_err = ndr_pull_struct_blob(&blob, ctx, &evt, (ndr_pull_flags_fn_t)ndr_pull_EVENTLOG_EVT_FILE); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { d_fprintf(stderr, _("evt pull failed: %s\n"), diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c index be926864a7..f627f1916c 100644 --- a/source3/utils/net_rpc_printer.c +++ b/source3/utils/net_rpc_printer.c @@ -85,7 +85,7 @@ static void display_reg_value(const char *subkey, struct regval_blob value) 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); if (!text) { break; } @@ -104,7 +104,7 @@ static void display_reg_value(const char *subkey, 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; } @@ -2423,7 +2423,7 @@ NTSTATUS rpc_printer_migrate_settings_internals(struct net_context *c, if (strequal(info[j].value_name, SPOOL_REG_PORTNAME)) { /* although windows uses a multi-sz, we use a sz */ - push_reg_sz(mem_ctx, NULL, &blob, SAMBA_PRINTER_PORT_NAME); + push_reg_sz(mem_ctx, &blob, SAMBA_PRINTER_PORT_NAME); fstrcpy(value.valuename, SPOOL_REG_PORTNAME); } @@ -2433,7 +2433,7 @@ NTSTATUS rpc_printer_migrate_settings_internals(struct net_context *c, nt_status = NT_STATUS_NO_MEMORY; goto done; } - push_reg_sz(mem_ctx, NULL, &blob, unc_name); + push_reg_sz(mem_ctx, &blob, unc_name); fstrcpy(value.valuename, SPOOL_REG_UNCNAME); } @@ -2454,13 +2454,13 @@ NTSTATUS rpc_printer_migrate_settings_internals(struct net_context *c, if (strequal(info[j].value_name, SPOOL_REG_SERVERNAME)) { - push_reg_sz(mem_ctx, NULL, &blob, longname); + push_reg_sz(mem_ctx, &blob, longname); fstrcpy(value.valuename, SPOOL_REG_SERVERNAME); } if (strequal(info[j].value_name, SPOOL_REG_SHORTSERVERNAME)) { - push_reg_sz(mem_ctx, NULL, &blob, global_myname()); + push_reg_sz(mem_ctx, &blob, global_myname()); fstrcpy(value.valuename, SPOOL_REG_SHORTSERVERNAME); } diff --git a/source3/utils/net_rpc_registry.c b/source3/utils/net_rpc_registry.c index 6d87bd4e1b..907358163e 100644 --- a/source3/utils/net_rpc_registry.c +++ b/source3/utils/net_rpc_registry.c @@ -961,7 +961,7 @@ static void dump_values( REGF_NK_REC *nk ) switch ( nk->values[i].type ) { case REG_SZ: blob = data_blob_const(nk->values[i].data, data_size); - pull_reg_sz(talloc_tos(), NULL, &blob, &data_str); + pull_reg_sz(talloc_tos(), &blob, &data_str); if (!data_str) { break; } @@ -1250,7 +1250,7 @@ static NTSTATUS rpc_registry_getsd_internal(struct net_context *c, blob.data = sd->data; blob.length = sd->size; - ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, NULL, &sec_desc, + ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, &sec_desc, (ndr_pull_flags_fn_t)ndr_pull_security_descriptor); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { status = ndr_map_error2ntstatus(ndr_err); diff --git a/source3/utils/net_rpc_service.c b/source3/utils/net_rpc_service.c index 3aacfd1d1d..3010305838 100644 --- a/source3/utils/net_rpc_service.c +++ b/source3/utils/net_rpc_service.c @@ -276,7 +276,7 @@ static NTSTATUS rpc_service_list_internal(struct net_context *c, break; } - ndr = ndr_pull_init_blob(&blob, mem_ctx, NULL); + ndr = ndr_pull_init_blob(&blob, mem_ctx); if (ndr == NULL) { status = NT_STATUS_NO_MEMORY; break; -- cgit