]> git.scripts.mit.edu Git - git.git/commitdiff
zero-initialize object_info structs
authorJeff King <peff@peff.net>
Sun, 7 Jul 2013 10:03:29 +0000 (06:03 -0400)
committerJunio C Hamano <gitster@pobox.com>
Sun, 7 Jul 2013 17:50:13 +0000 (10:50 -0700)
The sha1_object_info_extended function expects the caller to
provide a "struct object_info" which contains pointers to
"query" items that will be filled in. The purpose of
providing pointers rather than storing the response directly
in the struct is so that callers can choose not to incur the
expense in finding particular fields that they do not care
about.

Right now the only query item is "sizep", and all callers
set it explicitly to choose whether or not to query it; they
can then leave the rest of the struct uninitialized.

However, as we add new query items, each caller will have to
be updated to explicitly turn off the new ones (by setting
them to NULL).  Instead, let's teach each caller to
zero-initialize the struct, so that they do not have to
learn about each new query item added.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sha1_file.c
streaming.c

index 67e815b2db00e4d406693f82e96b11bb701509a5..79ef052b1139354f2d6a8e77cd238d9eb1f0d5ec 100644 (file)
@@ -2409,7 +2409,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;
+       struct object_info oi = {0};
 
        oi.sizep = sizep;
        return sha1_object_info_extended(sha1, &oi);
index cabcd9d1577d89c5e944a4c12e3a8e6af901078c..cac282f06b3751d8f316653daa79026c9633629c 100644 (file)
@@ -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;
+       struct object_info oi = {0};
        const unsigned char *real = lookup_replace_object(sha1);
        enum input_source src = istream_source(real, type, &oi);