* [PATCH] archive-tar: make write_extended_header() void
@ 2016-08-06 14:35 René Scharfe
2016-08-07 23:14 ` Jeff King
0 siblings, 1 reply; 2+ messages in thread
From: René Scharfe @ 2016-08-06 14:35 UTC (permalink / raw)
To: Git List; +Cc: Junio C Hamano, Jeff King
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>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] archive-tar: make write_extended_header() void
2016-08-06 14:35 [PATCH] archive-tar: make write_extended_header() void René Scharfe
@ 2016-08-07 23:14 ` Jeff King
0 siblings, 0 replies; 2+ messages in thread
From: Jeff King @ 2016-08-07 23:14 UTC (permalink / raw)
To: René Scharfe; +Cc: Git List, Junio C Hamano
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-08-07 23:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-06 14:35 [PATCH] archive-tar: make write_extended_header() void René Scharfe
2016-08-07 23:14 ` Jeff King
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).