diff options
author | Stephen Boyd <bebarino@gmail.com> | 2011-04-03 00:06:54 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-04-03 10:14:53 -0700 |
commit | 1e4cd68c0041d4c6aaa0562a4528a030944d37ee (patch) | |
tree | 05d5ec9abbd6b79aa4e180b385188e726c21f6c6 /csum-file.c | |
parent | cb35c0646d2b6a911f516ac2e45d2e23b038f646 (diff) | |
download | git-1e4cd68c0041d4c6aaa0562a4528a030944d37ee.tar.gz git-1e4cd68c0041d4c6aaa0562a4528a030944d37ee.tar.xz |
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 'csum-file.c')
-rw-r--r-- | csum-file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/csum-file.c b/csum-file.c index 4d50cc5ce..be49d5fcf 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; } |