[PATCH] Fix some sparse warnings
- From
Ramsay Jones <ramsay@ramsay1.demon.co.uk>
- Date
- Jul 15, 2013, 17:31 UTC
- Message-ID
- <51E431F1.6050002@ramsay1.demon.co.uk>
Sparse issues three "Using plain integer as NULL pointer" warnings. Each warning relates to the use of an '{0}' initialiser expression in the declaration of an 'struct object_info'. The first field of this structure has pointer type. Thus, in order to suppress these warnings, we replace the initialiser expression with '{NULL}'.
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> ---
Hi Jeff,
If you need to re-roll the patches in your 'jk/in-pack-size-measurement' branch, could you please squash this (or something like it) into the patches equivalent to commit 7c07385d ("zero-initialize object_info structs", 07-07-2013) [sha1_file.c and streaming.c] and commit 778d263a ("cat-file: add --batch-disk-sizes option", 07-07-2013) [builtin/cat-file.c].
Thanks!
ATB, Ramsay Jones
builtin/cat-file.c | 2 +- sha1_file.c | 2 +- streaming.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/cat-file.c b/builtin/cat-file.c index bf12883..860576e 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -135,7 +135,7 @@ static int batch_one_object(const char *obj_name, int print_contents) if (print_contents == BATCH) contents = read_sha1_file(sha1, &type, &size); else if (print_contents == BATCH_DISK_SIZES) { - struct object_info oi = {0}; + struct object_info oi = {NULL}; oi.disk_sizep = &size; type = sha1_object_info_extended(sha1, &oi); } diff --git a/sha1_file.c b/sha1_file.c index 4c2365f..e4ab0a4 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -2440,7 +2440,7 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi) int sha1_object_info(const unsigned char *sha1, unsigned long *sizep) { - struct object_info oi = {0}; + struct object_info oi = {NULL}; oi.sizep = sizep; return sha1_object_info_extended(sha1, &oi); diff --git a/streaming.c b/streaming.c index cac282f..5710065 100644 --- a/streaming.c +++ b/streaming.c @@ -135,7 +135,7 @@ struct git_istream *open_istream(const unsigned char *sha1, struct stream_filter *filter) { struct git_istream *st; - struct object_info oi = {0}; + struct object_info oi = {NULL}; const unsigned char *real = lookup_replace_object(sha1); enum input_source src = istream_source(real, type, &oi);
-- 1.8.3