From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 12 Aug 2016 16:47:37 +0000 (-0700)
Subject: Merge branch 'jk/big-and-future-archive-tar'
X-Git-Tag: v2.10.0-rc0~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/57734b4e88c4d61329c74f5f4fb042f7de622966?ds=inline;hp=-c

Merge branch 'jk/big-and-future-archive-tar'

A small code clean-up.

* jk/big-and-future-archive-tar:
archive-tar: make write_extended_header() void
---

57734b4e88c4d61329c74f5f4fb042f7de622966
diff --combined archive-tar.c
index 55682404d5,ce031f44ba..380e3aedd2
--- a/archive-tar.c
+++ b/archive-tar.c
@@@ -25,13 -25,8 +25,13 @@@ static int write_tar_filter_archive(con
   *
   * Likewise for the mtime (which happens to use a buffer of the same size).
   */
 +#if ULONG_MAX == 0xFFFFFFFF
 +#define USTAR_MAX_SIZE ULONG_MAX
 +#define USTAR_MAX_MTIME ULONG_MAX
 +#else
  #define USTAR_MAX_SIZE 077777777777UL
  #define USTAR_MAX_MTIME 077777777777UL
 +#endif
  
  /* writes out the whole block, but only if it is full */
  static void write_if_needed(void)
@@@ -213,9 -208,9 +213,9 @@@ static void prepare_header(struct archi
  	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 -221,6 +226,6 @@@
  	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 -299,8 +304,8 @@@
  	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));