diff options
| author | Andreas Schneider <asn@samba.org> | 2014-02-17 10:59:27 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2014-02-19 18:22:30 +0100 |
| commit | f8ac29d1acb528ae2471ac1300d134588ccaf990 (patch) | |
| tree | 8ebc1a5fd7d5c8bd8f52cd6eca63af83e553bb9f /source3/client/clitar.c | |
| parent | 4dd84bb8300e987acaad6d887bf32438e668f847 (diff) | |
| download | samba-f8ac29d1acb528ae2471ac1300d134588ccaf990.tar.gz samba-f8ac29d1acb528ae2471ac1300d134588ccaf990.tar.xz samba-f8ac29d1acb528ae2471ac1300d134588ccaf990.zip | |
s3-clitar: Improve readabilty of get_file_callback().
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Diffstat (limited to 'source3/client/clitar.c')
| -rw-r--r-- | source3/client/clitar.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source3/client/clitar.c b/source3/client/clitar.c index 7990e6f37c4..cf4260ecd3a 100644 --- a/source3/client/clitar.c +++ b/source3/client/clitar.c @@ -850,6 +850,7 @@ static NTSTATUS get_file_callback(struct cli_state *cli, NTSTATUS err = NT_STATUS_OK; char *remote_name; const char *initial_dir = client_get_cur_dir(); + int rc; remote_name = PANIC_IF_NULL(talloc_asprintf(ctx, "%s%s", initial_dir, finfo->name)); @@ -858,7 +859,8 @@ static NTSTATUS get_file_callback(struct cli_state *cli, goto out; } - if (tar_create_skip_path(&tar_ctx, remote_name, finfo)) { + rc = tar_create_skip_path(&tar_ctx, remote_name, finfo); + if (rc != 0) { DBG(5, ("--- %s\n", remote_name)); goto out; } @@ -873,7 +875,8 @@ static NTSTATUS get_file_callback(struct cli_state *cli, initial_dir, finfo->name)); mask = PANIC_IF_NULL(talloc_asprintf(ctx, "%s*", new_dir)); - if (tar_get_file(&tar_ctx, remote_name, finfo)) { + rc = tar_get_file(&tar_ctx, remote_name, finfo); + if (rc != 0) { err = NT_STATUS_UNSUCCESSFUL; goto out; } @@ -881,10 +884,9 @@ static NTSTATUS get_file_callback(struct cli_state *cli, client_set_cur_dir(new_dir); do_list(mask, TAR_DO_LIST_ATTR, get_file_callback, false, true); client_set_cur_dir(old_dir); - } - - else { - if (tar_get_file(&tar_ctx, remote_name, finfo)) { + } else { + rc = tar_get_file(&tar_ctx, remote_name, finfo); + if (rc != 0) { err = NT_STATUS_UNSUCCESSFUL; goto out; } |