# [PATCH] archive-tar: make write_extended_header() void 2 messages from 2016-08-06 to 2016-08-07. Participants: René Scharfe, Jeff King. Thread: https://gitlist.dev/t/43022 ## René Scharfe, 2016-08-06 14:35 Subject: [PATCH] archive-tar: make write_extended_header() void Message-ID: <57A5F5BA.8010702@web.de> URL: https://gitlist.dev/e/57A5F5BA.8010702%40web.de ``` The function write_extended_header() only ever returns 0. Simplify it and its caller by dropping its return value, like we did with write_global_extended_header() earlier. Signed-off-by: Rene Scharfe --- archive-tar.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/archive-tar.c b/archive-tar.c index 5568240..380e3ae 100644 --- a/archive-tar.c +++ b/archive-tar.c @@ -213,9 +213,9 @@ static void prepare_header(struct archiver_args *args, xsnprintf(header->chksum, sizeof(header->chksum), "%07o", ustar_header_chksum(header)); } -static int write_extended_header(struct archiver_args *args, - const unsigned char *sha1, - const void *buffer, unsigned long size) +static void write_extended_header(struct archiver_args *args, + const unsigned char *sha1, + const void *buffer, unsigned long size) { struct ustar_header header; unsigned int mode; @@ -226,7 +226,6 @@ static int write_extended_header(struct archiver_args *args, prepare_header(args, &header, mode, size); write_blocked(&header, sizeof(header)); write_blocked(buffer, size); - return 0; } static int write_tar_entry(struct archiver_args *args, @@ -305,12 +304,8 @@ static int write_tar_entry(struct archiver_args *args, prepare_header(args, &header, mode, size_in_header); if (ext_header.len > 0) { - err = write_extended_header(args, sha1, ext_header.buf, - ext_header.len); - if (err) { - free(buffer); - return err; - } + write_extended_header(args, sha1, ext_header.buf, + ext_header.len); } strbuf_release(&ext_header); write_blocked(&header, sizeof(header)); -- 2.9.2 ``` ## Jeff King, 2016-08-07 23:14 Subject: Re: [PATCH] archive-tar: make write_extended_header() void Message-ID: <20160807231434.a5i2fka5ezeiczrc@sigill.intra.peff.net> URL: https://gitlist.dev/e/20160807231434.a5i2fka5ezeiczrc%40sigill.intra.peff.net In-Reply-To: <57A5F5BA.8010702@web.de> ``` On Sat, Aug 06, 2016 at 04:35:38PM +0200, René Scharfe wrote: > The function write_extended_header() only ever returns 0. Simplify > it and its caller by dropping its return value, like we did with > write_global_extended_header() earlier. Obviously correct, and much nicer to read. Thanks. -Peff ```