diff options
| author | David Disseldorp <ddiss@samba.org> | 2014-02-14 17:16:14 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2014-02-19 18:22:29 +0100 |
| commit | 8dc6f0fb39647e37a444ac582b5b33e27b40b3dc (patch) | |
| tree | 3469cdd8a5a29a0ec4282a89aab2787f4e537665 /source3/client/client.c | |
| parent | 14c6e9b6b8c0f67a0cd85508c94413fb42ac20f7 (diff) | |
| download | samba-8dc6f0fb39647e37a444ac582b5b33e27b40b3dc.tar.gz samba-8dc6f0fb39647e37a444ac582b5b33e27b40b3dc.tar.xz samba-8dc6f0fb39647e37a444ac582b5b33e27b40b3dc.zip | |
clitar: get tar context handle via helper function
Add and use tar_get_ctx() to get the tarmode context handle in client.c,
rather than declaring an extern.
Also, add checks for NULL context pointer arguments.
Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source3/client/client.c')
| -rw-r--r-- | source3/client/client.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index 0cd59234d6..5157fc9797 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -5318,7 +5318,7 @@ static int do_host_query(const char *query_host) static int do_tar_op(const char *base_directory) { - extern struct tar tar_ctx; + struct tar *tar_ctx = tar_get_ctx(); int ret = 0; /* do we already have a connection? */ @@ -5345,7 +5345,7 @@ static int do_tar_op(const char *base_directory) } } - ret = tar_process(&tar_ctx); + ret = tar_process(tar_ctx); out_cli: cli_shutdown(cli); @@ -5393,7 +5393,7 @@ int main(int argc,char *argv[]) int rc = 0; bool tar_opt = false; bool service_opt = false; - extern struct tar tar_ctx; + struct tar *tar_ctx = tar_get_ctx(); struct poptOption long_options[] = { POPT_AUTOHELP @@ -5517,7 +5517,7 @@ int main(int argc,char *argv[]) break; } i++; - if (tar_parse_args(&tar_ctx, poptGetOptArg(pc), + if (tar_parse_args(tar_ctx, poptGetOptArg(pc), const_argv + i, argc - i)) { poptPrintUsage(pc, stderr, 0); exit(1); @@ -5611,7 +5611,7 @@ int main(int argc,char *argv[]) if(new_name_resolve_order) lp_set_cmdline("name resolve order", new_name_resolve_order); - if (!tar_to_process(&tar_ctx) && !query_host && !service && !message) { + if (!tar_to_process(tar_ctx) && !query_host && !service && !message) { poptPrintUsage(pc, stderr, 0); exit(1); } @@ -5626,7 +5626,7 @@ int main(int argc,char *argv[]) max_protocol = lp_client_max_protocol(); - if (tar_to_process(&tar_ctx)) { + if (tar_to_process(tar_ctx)) { if (cmdstr) process_command_string(cmdstr); rc = do_tar_op(base_directory); |