archive-tar: make write_extended_header() void
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>
René Scharfe committed
Aug 6, 2016 at 16:35 UTC
560b0e8f52a734434fecb65647d790913740617f
1 file changed
+5
-10
archive-tar.c
+5
-10
@@ -208,9 +208,9 @@ static void prepare_header(struct archiver_args *args,
208
xsnprintf(header->chksum, sizeof(header->chksum), "%07o", ustar_header_chksum(header));
209
}
210
211
-static int write_extended_header(struct archiver_args *args,
212
- const unsigned char *sha1,
213
- const void *buffer, unsigned long size)
211
+static void write_extended_header(struct archiver_args *args,
212
+ const unsigned char *sha1,
213
+ const void *buffer, unsigned long size)
214
{
215
struct ustar_header header;
216
unsigned int mode;
@@ -221,7 +221,6 @@ static int write_extended_header(struct archiver_args *args,
221
prepare_header(args, &header, mode, size);
222
write_blocked(&header, sizeof(header));
223
write_blocked(buffer, size);
224
- return 0;
224
}
225
226
static int write_tar_entry(struct archiver_args *args,
@@ -300,12 +299,8 @@ static int write_tar_entry(struct archiver_args *args,
299
prepare_header(args, &header, mode, size_in_header);
300
301
if (ext_header.len > 0) {
303
- err = write_extended_header(args, sha1, ext_header.buf,
304
- ext_header.len);
305
- if (err) {
306
- free(buffer);
307
- return err;
308
- }
302
+ write_extended_header(args, sha1, ext_header.buf,
303
+ ext_header.len);
304
}
305
strbuf_release(&ext_header);
306
write_blocked(&header, sizeof(header));