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 | |
| 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>
| -rw-r--r-- | builtin/grep.c | 6 | ||||
| -rw-r--r-- | builtin/index-pack.c | 2 | ||||
| -rw-r--r-- | builtin/receive-pack.c | 2 | ||||
| -rw-r--r-- | csum-file.c | 2 | ||||
| -rw-r--r-- | pack-check.c | 2 | ||||
| -rw-r--r-- | pkt-line.c | 2 | ||||
| -rw-r--r-- | rerere.c | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index 891e5eab3..10a1f6531 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 5a67c8181..31f001f10 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 27050e7c1..e1ba4dc69 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" 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; } diff --git a/pack-check.c b/pack-check.c index c3bf21dbc..a1a521648 100644 --- a/pack-check.c +++ b/pack-check.c @@ -23,7 +23,7 @@ int check_pack_crc(struct packed_git *p, struct pack_window **w_curs, off_t offset, off_t len, unsigned int nr) { const uint32_t *index_crc; - uint32_t data_crc = crc32(0, Z_NULL, 0); + uint32_t data_crc = crc32(0, NULL, 0); do { unsigned int avail; diff --git a/pkt-line.c b/pkt-line.c index cd1bd2641..5a04984ea 100644 --- a/pkt-line.c +++ b/pkt-line.c @@ -1,7 +1,7 @@ #include "cache.h" #include "pkt-line.h" -const char *packet_trace_prefix = "git"; +static const char *packet_trace_prefix = "git"; static const char trace_key[] = "GIT_TRACE_PACKET"; void packet_trace_identity(const char *prog) @@ -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; |