Skip to contentSkip to conversation

archive-tar: make write_extended_header() void

PATCH In review René Scharfe 2 participants 2 messages Aug 6, 2016 – Aug 7, 2016

lore
Share & tools
lore

René Scharfe

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 archive-tar.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)
archive-tar.c +5 -10
index 5568240..380e3ae 100644
@@ -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));
Signature · 1 line
2.9.2
#1 lore raw
Quoted 3 lines · René Scharfe

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