Merge branch 'maint-2.7' into maint

gitster · gitster · commit adbcfe6547fd · 2016-05-26T13:16:51.000-07:00
* maint-2.7:
  archive-tar: convert snprintf to xsnprintf
diff --git a/archive-tar.c b/archive-tar.c
@@ -181,7 +181,7 @@ static void prepare_header(struct archiver_args *args,
 	memcpy(header->magic, "ustar", 6);
 	memcpy(header->version, "00", 2);
 
-	snprintf(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,

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ static void prepare_header(struct archiver_args *args,`
`181`	`181`	`memcpy(header->magic, "ustar", 6);`
`182`	`182`	`memcpy(header->version, "00", 2);`
`183`	`183`
`184`		`- snprintf(header->chksum, sizeof(header->chksum), "%07o", ustar_header_chksum(header));`
	`184`	`+ xsnprintf(header->chksum, sizeof(header->chksum), "%07o", ustar_header_chksum(header));`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`static int write_extended_header(struct archiver_args *args,`