archive-tar: drop return value
We never do any error checks, and so never return anything but "0". Let's just drop this to simplify the code. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Jun 30, 2016 at 05:09 UTC
5caeeb83bcb88622db739fe27ee8bfc64e9cbf21
1 file changed
+4
-7
archive-tar.c
+4
-7
@@ -319,13 +319,12 @@ static int write_tar_entry(struct archiver_args *args,
319
return err;
320
}
321
322
-static int write_global_extended_header(struct archiver_args *args)
322
+static void write_global_extended_header(struct archiver_args *args)
323
{
324
const unsigned char *sha1 = args->commit_sha1;
325
struct strbuf ext_header = STRBUF_INIT;
326
struct ustar_header header;
327
unsigned int mode;
328
- int err = 0;
328
329
if (sha1)
330
strbuf_append_ext_header(&ext_header, "comment",
@@ -337,7 +336,7 @@ static int write_global_extended_header(struct archiver_args *args)
336
}
337
338
if (!ext_header.len)
340
- return 0;
339
+ return;
340
341
memset(&header, 0, sizeof(header));
342
*header.typeflag = TYPEFLAG_GLOBAL_HEADER;
@@ -347,7 +346,6 @@ static int write_global_extended_header(struct archiver_args *args)
346
write_blocked(&header, sizeof(header));
347
write_blocked(ext_header.buf, ext_header.len);
348
strbuf_release(&ext_header);
350
- return err;
349
}
350
351
static struct archiver **tar_filters;
@@ -423,9 +421,8 @@ static int write_tar_archive(const struct archiver *ar,
421
{
422
int err = 0;
423
426
- err = write_global_extended_header(args);
427
- if (!err)
428
- err = write_archive_entries(args, write_tar_entry);
424
+ write_global_extended_header(args);
425
+ err = write_archive_entries(args, write_tar_entry);
426
if (!err)
427
write_trailer();
428
return err;