From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: "Remi Galan Alfonso" <remi.galan-alfonso@ensimag.grenoble-inp.fr>,
git@vger.kernel.org, "René Scharfe" <l.s.r@web.de>,
"Robin H. Johnson" <robbat2@gentoo.org>
Subject: Re: [PATCH v3 4/4] archive-tar: drop return value
Date: Fri, 24 Jun 2016 12:10:44 -0700 [thread overview]
Message-ID: <xmqqoa6qflmz.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20160624131325.GA28941@sigill.intra.peff.net> (Jeff King's message of "Fri, 24 Jun 2016 09:13:25 -0400")
Jeff King <peff@peff.net> writes:
> On Fri, Jun 24, 2016 at 01:49:24PM +0200, Remi Galan Alfonso wrote:
>
>> Hi Peff,
>>
>> Jeff King <peff@peff.net> writes:
>> > @@ -413,7 +411,7 @@ static int write_tar_archive(const struct archiver *ar,
>> > {
>> > int err = 0;
>> >
>> > - err = write_global_extended_header(args);
>> > + write_global_extended_header(args);
>> > if (!err)
>> > err = write_archive_entries(args, write_tar_entry);
>>
>> If we drop the error code from 'write_global_extended_header' then the
>> above 'if (!err)' becomes useless (always evaluates to 'true' since
>> 'err' is set to '0').
>
> Thanks, you're right.
>
> I wondered if we could drop "err" entirely, but write_archive_entries()
> does indeed have some error code paths (everybody uses write_or_die, but
> we return an error for things like unknown file types).
You could if you did this ;-)
Which I do not necessarily think is a good idea.
This may be easier to read
write_global_extended_header(args)
err = write_archive_entries(args, write_tar_entry);
if (!err)
write_trailer();
return err;
though.
archive-tar.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/archive-tar.c b/archive-tar.c
index 903b74d..eed2c96 100644
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -412,11 +412,9 @@ static int write_tar_archive(const struct archiver *ar,
int err = 0;
write_global_extended_header(args);
- if (!err)
- err = write_archive_entries(args, write_tar_entry);
- if (!err)
- write_trailer();
- return err;
+
+ return (write_archive_entries(args, write_tar_entry) ||
+ write_trailer());
}
static int write_tar_filter_archive(const struct archiver *ar,
prev parent reply other threads:[~2016-06-24 19:10 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-16 4:35 [PATCH 0/2] friendlier handling of overflows in archive-tar Jeff King
2016-06-16 4:37 ` [PATCH 1/2] archive-tar: write extended headers for file sizes >= 8GB Jeff King
2016-06-20 22:54 ` René Scharfe
2016-06-21 15:59 ` Jeff King
2016-06-21 16:02 ` Jeff King
2016-06-21 20:42 ` René Scharfe
2016-06-21 20:57 ` René Scharfe
2016-06-21 21:04 ` Jeff King
2016-06-22 5:46 ` René Scharfe
2016-06-21 21:02 ` Jeff King
2016-06-22 5:46 ` René Scharfe
2016-06-23 19:21 ` Jeff King
2016-06-21 20:54 ` René Scharfe
2016-06-21 19:44 ` Robin H. Johnson
2016-06-21 20:57 ` Jeff King
2016-06-16 4:37 ` [PATCH 2/2] archive-tar: write extended headers for far-future mtime Jeff King
2016-06-20 22:54 ` René Scharfe
2016-06-22 5:46 ` René Scharfe
2016-06-23 19:22 ` Jeff King
2016-06-23 21:38 ` René Scharfe
2016-06-23 21:39 ` Jeff King
2016-06-16 17:55 ` [PATCH 0/2] friendlier handling of overflows in archive-tar Junio C Hamano
2016-06-21 16:16 ` Jeff King
2016-06-21 16:16 ` [PATCH v2 1/2] archive-tar: write extended headers for file sizes >= 8GB Jeff King
2016-06-21 16:17 ` [PATCH v2 2/2] archive-tar: write extended headers for far-future mtime Jeff King
2016-06-21 18:43 ` [PATCH 0/2] friendlier handling of overflows in archive-tar Junio C Hamano
2016-06-23 23:15 ` [PATCH v3] " Jeff King
2016-06-23 23:20 ` [PATCH v3 1/4] t5000: test tar files that overflow ustar headers Jeff King
2016-06-23 23:31 ` Jeff King
2016-06-24 16:38 ` Johannes Sixt
2016-06-24 16:46 ` Jeff King
2016-06-24 17:05 ` Johannes Sixt
2016-06-24 19:39 ` [PATCH 0/4] portable signal-checking in tests Jeff King
2016-06-24 19:43 ` [PATCH 1/4] tests: factor portable signal check out of t0005 Jeff King
2016-06-24 20:52 ` Johannes Sixt
2016-06-24 21:05 ` Jeff King
2016-06-24 21:32 ` Johannes Sixt
2016-06-24 19:44 ` [PATCH 2/4] t0005: use test_match_signal as appropriate Jeff King
2016-06-24 19:45 ` [PATCH 3/4] test_must_fail: use test_match_signal Jeff King
2016-06-24 19:45 ` [PATCH 4/4] t/lib-git-daemon: " Jeff King
2016-06-24 19:48 ` [PATCH 0/4] portable signal-checking in tests Jeff King
2016-06-24 18:56 ` [PATCH v3 1/4] t5000: test tar files that overflow ustar headers Junio C Hamano
2016-06-24 19:07 ` Jeff King
2016-06-24 19:44 ` Junio C Hamano
2016-06-24 20:58 ` Jeff King
2016-06-24 22:41 ` Junio C Hamano
2016-06-24 23:22 ` Jeff King
2016-06-24 20:58 ` Eric Sunshine
2016-06-24 21:09 ` Jeff King
2016-06-23 23:21 ` [PATCH v3 2/4] archive-tar: write extended headers for file sizes >= 8GB Jeff King
2016-06-24 19:01 ` Junio C Hamano
2016-06-24 19:10 ` Jeff King
2016-06-24 19:45 ` Junio C Hamano
2016-06-24 19:46 ` Jeff King
2016-06-23 23:21 ` [PATCH v3 3/4] archive-tar: write extended headers for far-future mtime Jeff King
2016-06-24 19:06 ` Junio C Hamano
2016-06-24 19:16 ` Jeff King
2016-06-23 23:21 ` [PATCH v3 4/4] archive-tar: drop return value Jeff King
2016-06-24 11:49 ` Remi Galan Alfonso
2016-06-24 13:13 ` Jeff King
2016-06-24 19:10 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqoa6qflmz.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=l.s.r@web.de \
--cc=peff@peff.net \
--cc=remi.galan-alfonso@ensimag.grenoble-inp.fr \
--cc=robbat2@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).