X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Findex-pack.c;h=31f001f1059ec533ee62d6bd951b068d7f924f50;hb=8272bcabac0b68e6d526ec0fcbc6d6e532b3e2af;hp=c7e600db4745c80fddcb14986bc192d80630aa51;hpb=f35bb7c38d546a9e8360cde53c03b0b881ab4475;p=git.git

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index c7e600db4..31f001f10 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -207,7 +207,7 @@ static void parse_pack_header(void)
 static NORETURN void bad_object(unsigned long offset, const char *format,
 		       ...) __attribute__((format (printf, 2, 3)));
 
-static void bad_object(unsigned long offset, const char *format, ...)
+static NORETURN void bad_object(unsigned long offset, const char *format, ...)
 {
 	va_list params;
 	char buf[1024];
@@ -294,7 +294,7 @@ static void *unpack_raw_entry(struct object_entry *obj, union delta_base *delta_
 	void *data;
 
 	obj->idx.offset = consumed_bytes;
-	input_crc32 = crc32(0, Z_NULL, 0);
+	input_crc32 = crc32(0, NULL, 0);
 
 	p = fill(1);
 	c = *p;