diff options
author | Andreas Schneider <asn@samba.org> | 2014-02-17 11:03:53 +0100 |
---|---|---|
committer | Andreas Schneider <asn@samba.org> | 2014-02-19 18:22:30 +0100 |
commit | f58ef3878e0718cd95e09ffbba5dbaa374c2c2f0 (patch) | |
tree | 0065680a65bcfe4a81869639fad2eae2a7433163 /source3/client/clitar.c | |
parent | f8ac29d1acb528ae2471ac1300d134588ccaf990 (diff) | |
download | samba-f58ef3878e0718cd95e09ffbba5dbaa374c2c2f0.tar.gz samba-f58ef3878e0718cd95e09ffbba5dbaa374c2c2f0.tar.xz samba-f58ef3878e0718cd95e09ffbba5dbaa374c2c2f0.zip |
s3-clitar: Improve readabilty of tar_extract().
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 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source3/client/clitar.c b/source3/client/clitar.c index cf4260ecd3a..ac69920e0ac 100644 --- a/source3/client/clitar.c +++ b/source3/client/clitar.c @@ -1015,6 +1015,7 @@ static int tar_extract(struct tar *t) int r; struct archive_entry *entry; const size_t bsize = t->mode.blocksize * TAR_BLOCK_UNIT; + int rc; t->archive = archive_read_new(); archive_read_support_format_all(t->archive); @@ -1047,14 +1048,16 @@ static int tar_extract(struct tar *t) goto out; } - if (tar_extract_skip_path(t, entry)) { + rc = tar_extract_skip_path(t, entry); + if (rc != 0) { DBG(5, ("--- %s\n", archive_entry_pathname(entry))); continue; } DBG(5, ("+++ %s\n", archive_entry_pathname(entry))); - if (tar_send_file(t, entry)) { + rc = tar_send_file(t, entry); + if (rc != 0) { err = 1; goto out; } |