From f58ef3878e0718cd95e09ffbba5dbaa374c2c2f0 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 17 Feb 2014 11:03:53 +0100 Subject: [PATCH] s3-clitar: Improve readabilty of tar_extract(). Signed-off-by: Andreas Schneider Reviewed-by: David Disseldorp --- source3/client/clitar.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/source3/client/clitar.c b/source3/client/clitar.c index cf4260ecd3a4..ac69920e0ac8 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; } -- 2.34.1