Jeff King <peff@xxxxxxxx> writes:
> On Fri, Jun 24, 2016 at 01:49:24PM +0200, Remi Galan Alfonso wrote:
>
>> Hi Peff,
>>
>> Jeff King <peff@xxxxxxxx> 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,
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html