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>

diff --git a/archive-tar.c b/archive-tar.c
index 7ea4e90814d26b99c9e2de598daa874ec4b216fd..ce031f44ba3172c8fa3521264eff31ad6cb182bf 100644 (file)
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -208,9 +208,9 @@ static void prepare_header(struct archiver_args *args,
        xsnprintf(header->chksum, sizeof(header->chksum), "%07o", ustar_header_chksum(header));
 }
 
        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;
 {
        struct ustar_header header;
        unsigned int mode;


@@ -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);
        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,
 }
 
 static int write_tar_entry(struct archiver_args *args,


@@ -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) {
        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));
        }
        strbuf_release(&ext_header);
        write_blocked(&header, sizeof(header));