{"thread":{"id":"43022","subject":"[PATCH] archive-tar: make write_extended_header() void","startedAt":"2016-08-06T21:08:01Z","lastAt":"2016-08-07T23:14:41Z","messageCount":2,"participants":["René Scharfe","Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"293300","messageId":"57A5F5BA.8010702@web.de","threadId":"43022","inReplyTo":null,"subject":"[PATCH] archive-tar: make write_extended_header() void","fromName":"René Scharfe","fromEmail":"l.s.r@web.de","sentAt":"2016-08-06T14:35:38Z","receivedAt":"2016-08-06T21:08:01Z","isPatch":true,"sender":{"key":"l.s.r@web.de","avatar":"https://avatars.githubusercontent.com/u/26122331?v=4"},"body":"The function write_extended_header() only ever returns 0.  Simplify\nit and its caller by dropping its return value, like we did with\nwrite_global_extended_header() earlier.\n\nSigned-off-by: Rene Scharfe <l.s.r@web.de>\n---\n archive-tar.c | 15 +++++----------\n 1 file changed, 5 insertions(+), 10 deletions(-)\n\ndiff --git a/archive-tar.c b/archive-tar.c\nindex 5568240..380e3ae 100644\n--- a/archive-tar.c\n+++ b/archive-tar.c\n@@ -213,9 +213,9 @@ static void prepare_header(struct archiver_args *args,\n \txsnprintf(header->chksum, sizeof(header->chksum), \"%07o\", ustar_header_chksum(header));\n }\n \n-static int write_extended_header(struct archiver_args *args,\n-\t\t\t\t const unsigned char *sha1,\n-\t\t\t\t const void *buffer, unsigned long size)\n+static void write_extended_header(struct archiver_args *args,\n+\t\t\t\t  const unsigned char *sha1,\n+\t\t\t\t  const void *buffer, unsigned long size)\n {\n \tstruct ustar_header header;\n \tunsigned int mode;\n@@ -226,7 +226,6 @@ static int write_extended_header(struct archiver_args *args,\n \tprepare_header(args, &header, mode, size);\n \twrite_blocked(&header, sizeof(header));\n \twrite_blocked(buffer, size);\n-\treturn 0;\n }\n \n static int write_tar_entry(struct archiver_args *args,\n@@ -305,12 +304,8 @@ static int write_tar_entry(struct archiver_args *args,\n \tprepare_header(args, &header, mode, size_in_header);\n \n \tif (ext_header.len > 0) {\n-\t\terr = write_extended_header(args, sha1, ext_header.buf,\n-\t\t\t\t\t    ext_header.len);\n-\t\tif (err) {\n-\t\t\tfree(buffer);\n-\t\t\treturn err;\n-\t\t}\n+\t\twrite_extended_header(args, sha1, ext_header.buf,\n+\t\t\t\t      ext_header.len);\n \t}\n \tstrbuf_release(&ext_header);\n \twrite_blocked(&header, sizeof(header));\n-- \n2.9.2\n\n"},{"id":"293331","messageId":"20160807231434.a5i2fka5ezeiczrc@sigill.intra.peff.net","threadId":"43022","inReplyTo":"57A5F5BA.8010702@web.de","subject":"Re: [PATCH] archive-tar: make write_extended_header() void","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2016-08-07T23:14:35Z","receivedAt":"2016-08-07T23:14:41Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sat, Aug 06, 2016 at 04:35:38PM +0200, René Scharfe wrote:\n\n> The function write_extended_header() only ever returns 0.  Simplify\n> it and its caller by dropping its return value, like we did with\n> write_global_extended_header() earlier.\n\nObviously correct, and much nicer to read. Thanks.\n\n-Peff\n"}]}