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 --- rerere.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rerere.c') diff --git a/rerere.c b/rerere.c index 3d00a71ff9..22dfc843da 100644 --- a/rerere.c +++ b/rerere.c @@ -438,7 +438,7 @@ static int merge(const char *name, const char *path) ret = 1; goto out; } - ret = ll_merge(&result, path, &base, NULL, &cur, "", &other, "", 0); + ret = ll_merge(&result, path, &base, NULL, &cur, "", &other, "", NULL); if (!ret) { FILE *f; -- cgit v1.2.3