summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamsay Jones <ramsay@ramsay1.demon.co.uk>2013-07-18 21:25:50 +0100
committerJunio C Hamano <gitster@pobox.com>2013-07-18 16:43:47 -0700
commitd099b7173dabdeeb1f339151ac2169b3a91bf631 (patch)
tree566f335eb1fef1a43bfd652b363239ff82d8444c
parent23c339c0f262aad2515e48c33ec8f35d476d2ddc (diff)
downloadgit-d099b7173dabdeeb1f339151ac2169b3a91bf631.tar.gz
Fix some sparse warnings
Sparse issues some "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> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--sha1_file.c2
-rw-r--r--streaming.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sha1_file.c b/sha1_file.c
index 2500b94478..452e4647b3 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2477,7 +2477,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)
{
enum object_type type;
- struct object_info oi = {0};
+ struct object_info oi = {NULL};
oi.typep = &type;
oi.sizep = sizep;
diff --git a/streaming.c b/streaming.c
index 870657ab56..acc07a6ff1 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);