diff options
| author | Günther Deschner <gd@samba.org> | 2009-03-25 23:23:06 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2009-03-26 10:42:13 +0100 |
| commit | fe340eb92fd2e5dfef977dc391d2a43ce970e0ea (patch) | |
| tree | f56dbb238e960ab14c264c2a76941b2cec3299b3 | |
| parent | 24d5229a81e1067662930d42f8c59b3a0adac1e0 (diff) | |
| download | samba-fe340eb92fd2e5dfef977dc391d2a43ce970e0ea.tar.gz samba-fe340eb92fd2e5dfef977dc391d2a43ce970e0ea.tar.bz2 samba-fe340eb92fd2e5dfef977dc391d2a43ce970e0ea.zip | |
s3:rpc_parse: remove unused init_unistr().
Guenther
| -rw-r--r-- | source3/include/proto.h | 1 | ||||
| -rw-r--r-- | source3/rpc_parse/parse_misc.c | 19 | ||||
| -rw-r--r-- | source3/utils/net_rpc_printer.c | 9 |
3 files changed, 4 insertions, 25 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index d619c3ba00..77be0aba09 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -5695,7 +5695,6 @@ bool smb_io_system_time(const char *desc, prs_struct *ps, int depth, SYSTEMTIME bool make_systemtime(SYSTEMTIME *systime, struct tm *unixtime); bool smb_io_uuid(const char *desc, struct GUID *uuid, prs_struct *ps, int depth); -void init_unistr(UNISTR *str, const char *buf); void init_unistr2(UNISTR2 *str, const char *buf, enum unistr2_term_codes flags); /* The following definitions come from rpc_parse/parse_prs.c */ diff --git a/source3/rpc_parse/parse_misc.c b/source3/rpc_parse/parse_misc.c index ffbd67befe..1ea4ecf46f 100644 --- a/source3/rpc_parse/parse_misc.c +++ b/source3/rpc_parse/parse_misc.c @@ -129,25 +129,6 @@ bool smb_io_uuid(const char *desc, struct GUID *uuid, } /******************************************************************* - Inits a UNISTR structure. -********************************************************************/ - -void init_unistr(UNISTR *str, const char *buf) -{ - size_t len; - - if (buf == NULL) { - str->buffer = NULL; - return; - } - - len = rpcstr_push_talloc(talloc_tos(), &str->buffer, buf); - if (len == (size_t)-1) { - str->buffer = NULL; - } -} - -/******************************************************************* Inits a UNISTR2 structure. ********************************************************************/ diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c index 1d0e9a38be..9721628f02 100644 --- a/source3/utils/net_rpc_printer.c +++ b/source3/utils/net_rpc_printer.c @@ -2260,14 +2260,13 @@ NTSTATUS rpc_printer_migrate_settings_internals(struct net_context *c, info_dst.info2.secdesc = NULL; #if 0 - if (asprintf(&devicename, "\\\\%s\\%s", longname, - printername) < 0) { + info_dst.info2.devmode.devicename = + talloc_asprintf(mem_ctx, "\\\\%s\\%s", + longname, printername); + if (!info_dst.info2.devmode.devicename) { nt_status = NT_STATUS_NO_MEMORY; goto done; } - - init_unistr(&ctr_dst.printers_2->devmode->devicename, - devicename); #endif if (!net_spoolss_setprinter(pipe_hnd_dst, mem_ctx, &hnd_dst, level, &info_dst)) |