summaryrefslogtreecommitdiff
path: root/builtin
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 /builtin
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 'builtin')
-rw-r--r--builtin/grep.c6
-rw-r--r--builtin/index-pack.c2
-rw-r--r--builtin/receive-pack.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/builtin/grep.c b/builtin/grep.c
index 891e5ea..10a1f65 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -414,10 +414,10 @@ static void *load_file(const char *filename, size_t *sz)
err_ret:
if (errno != ENOENT)
error(_("'%s': %s"), filename, strerror(errno));
- return 0;
+ return NULL;
}
if (!S_ISREG(st.st_mode))
- return 0;
+ return NULL;
*sz = xsize_t(st.st_size);
i = open(filename, O_RDONLY);
if (i < 0)
@@ -427,7 +427,7 @@ static void *load_file(const char *filename, size_t *sz)
error(_("'%s': short read %s"), filename, strerror(errno));
close(i);
free(data);
- return 0;
+ return NULL;
}
close(i);
data[*sz] = 0;
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 5a67c81..31f001f 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -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;
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 27050e7..e1ba4dc 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "builtin.h"
#include "pack.h"
#include "refs.h"
#include "pkt-line.h"