summaryrefslogtreecommitdiff
path: root/rerere.c
diff options
context:
space:
mode:
authorStephen Boyd <bebarino@gmail.com>2011-04-03 07:06:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-04-03 17:14:53 (GMT)
commit1e4cd68c0041d4c6aaa0562a4528a030944d37ee (patch)
tree05d5ec9abbd6b79aa4e180b385188e726c21f6c6 /rerere.c
parentcb35c0646d2b6a911f516ac2e45d2e23b038f646 (diff)
downloadgit-1e4cd68c0041d4c6aaa0562a4528a030944d37ee.zip
git-1e4cd68c0041d4c6aaa0562a4528a030944d37ee.tar.gz
git-1e4cd68c0041d4c6aaa0562a4528a030944d37ee.tar.bz2
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 <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'rerere.c')
-rw-r--r--rerere.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/rerere.c b/rerere.c
index 3d00a71..22dfc84 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;