From 1e4cd68c0041d4c6aaa0562a4528a030944d37ee Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Sun, 3 Apr 2011 00:06:54 -0700 Subject: sparse: Fix errors and silence warnings * load_file() returns a void pointer but is using 0 for the return value * builtin/receive-pack.c forgot to include builtin.h * packet_trace_prefix can be marked static * ll_merge takes a pointer for its last argument, not an int * crc32 expects a pointer as the second argument but Z_NULL is defined to be 0 (see 38f4d13 sparse fix: Using plain integer as NULL pointer, 2006-11-18 for more info) Signed-off-by: Stephen Boyd Signed-off-by: Junio C Hamano --- csum-file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'csum-file.c') diff --git a/csum-file.c b/csum-file.c index 4d50cc5ce1..be49d5fcf9 100644 --- a/csum-file.c +++ b/csum-file.c @@ -116,7 +116,7 @@ struct sha1file *sha1fd_throughput(int fd, const char *name, struct progress *tp void crc32_begin(struct sha1file *f) { - f->crc32 = crc32(0, Z_NULL, 0); + f->crc32 = crc32(0, NULL, 0); f->do_crc = 1; } -- cgit v1.2.3