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_rpc_printer.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'source3/utils/net_rpc_printer.c') diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c index be926864a7b..f627f1916c4 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); } -- cgit