Skip to content

Commit

Permalink
archive-tar: make write_extended_header() void
Browse files Browse the repository at this point in the history
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 <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
rscharfe authored and gitster committed Aug 6, 2016
1 parent 5caeeb8 commit 560b0e8
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions archive-tar.c
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,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;
Expand All @@ -221,7 +221,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,
Expand Down Expand Up @@ -300,12 +299,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));
Expand Down

0 comments on commit 560b0e8

Please sign in to comment.