builtin/remote.c: add and use a REF_STATES_INIT

Use a new REF_STATES_INIT designated initializer instead of assigning
to the "strdup_strings" member of the previously memzero()'d version
of this struct.

The pattern of assigning to "strdup_strings" dates back to
211c89682ee (Make git-remote a builtin, 2008-02-29) (when it was
"strdup_paths"), i.e. long before we used anything like our current
established *_INIT patterns consistently.

Then in e61e0cc6b70 (builtin-remote: teach show to display remote
HEAD, 2009-02-25) and e5dcbfd9ab7 (builtin-remote: new show output
style for push refspecs, 2009-02-25) we added some more of these.

As it turns out we only initialized this struct three times, all the
other uses were of pointers to those initialized structs. So let's
initialize it in those three places, skip the memset(), and pass those
structs down appropriately.

This would be a behavior change if we had codepaths that relied say on
implicitly having had "new_refs" initialized to STRING_LIST_INIT_NODUP
with the memset(), but only set the "strdup_strings" on some other
struct, but then called string_list_append() on "new_refs". There
isn't any such codepath, all of the late assignments to
"strdup_strings" assigned to those structs that we'd use for those
codepaths.

So just initializing them all up-front makes for easier to understand
code, i.e. in the pre-image it looked as though we had that tricky
edge case, but we didn't.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/remote.c b/builtin/remote.c
index 7f88e6ce9deb7666b7ce5cb9179b895a25281e64..160dd954f741c013098ef869035074028848e765 100644 (file)
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -344,6 +344,14 @@ struct ref_states {
        int queried;
 };
 
+#define REF_STATES_INIT { \
+       .new_refs = STRING_LIST_INIT_DUP, \
+       .stale = STRING_LIST_INIT_DUP, \
+       .tracked = STRING_LIST_INIT_DUP, \
+       .heads = STRING_LIST_INIT_DUP, \
+       .push = STRING_LIST_INIT_DUP, \
+}
+
 static int get_ref_states(const struct ref *remote_refs, struct ref_states *states)
 {
        struct ref *fetch_map = NULL, **tail = &fetch_map;
@@ -355,9 +363,6 @@ static int get_ref_states(const struct ref *remote_refs, struct ref_states *stat
                        die(_("Could not get fetch map for refspec %s"),
                                states->remote->fetch.raw[i]);
 
-       states->new_refs.strdup_strings = 1;
-       states->tracked.strdup_strings = 1;
-       states->stale.strdup_strings = 1;
        for (ref = fetch_map; ref; ref = ref->next) {
                if (!ref->peer_ref || !ref_exists(ref->peer_ref->name))
                        string_list_append(&states->new_refs, abbrev_branch(ref->name));
@@ -406,7 +411,6 @@ static int get_push_ref_states(const struct ref *remote_refs,
 
        match_push_refs(local_refs, &push_map, &remote->push, MATCH_REFS_NONE);
 
-       states->push.strdup_strings = 1;
        for (ref = push_map; ref; ref = ref->next) {
                struct string_list_item *item;
                struct push_info *info;
@@ -449,7 +453,6 @@ static int get_push_ref_states_noquery(struct ref_states *states)
        if (remote->mirror)
                return 0;
 
-       states->push.strdup_strings = 1;
        if (!remote->push.nr) {
                item = string_list_append(&states->push, _("(matching)"));
                info = item->util = xcalloc(1, sizeof(struct push_info));
@@ -483,7 +486,6 @@ static int get_head_names(const struct ref *remote_refs, struct ref_states *stat
        refspec.force = 0;
        refspec.pattern = 1;
        refspec.src = refspec.dst = "refs/heads/*";
-       states->heads.strdup_strings = 1;
        get_fetch_map(remote_refs, &refspec, &fetch_map_tail, 0);
        matches = guess_remote_head(find_ref_by_name(remote_refs, "HEAD"),
                                    fetch_map, 1);
@@ -1212,7 +1214,7 @@ static int show(int argc, const char **argv)
                OPT_BOOL('n', NULL, &no_query, N_("do not query remotes")),
                OPT_END()
        };
-       struct ref_states states;
+       struct ref_states states = REF_STATES_INIT;
        struct string_list info_list = STRING_LIST_INIT_NODUP;
        struct show_info info;
 
@@ -1225,7 +1227,6 @@ static int show(int argc, const char **argv)
        if (!no_query)
                query_flag = (GET_REF_STATES | GET_HEAD_NAMES | GET_PUSH_REF_STATES);
 
-       memset(&states, 0, sizeof(states));
        memset(&info, 0, sizeof(info));
        info.states = &states;
        info.list = &info_list;
@@ -1334,8 +1335,7 @@ static int set_head(int argc, const char **argv)
        if (!opt_a && !opt_d && argc == 2) {
                head_name = xstrdup(argv[1]);
        } else if (opt_a && !opt_d && argc == 1) {
-               struct ref_states states;
-               memset(&states, 0, sizeof(states));
+               struct ref_states states = REF_STATES_INIT;
                get_remote_ref_states(argv[0], &states, GET_HEAD_NAMES);
                if (!states.heads.nr)
                        result |= error(_("Cannot determine remote HEAD"));
@@ -1374,14 +1374,13 @@ static int set_head(int argc, const char **argv)
 static int prune_remote(const char *remote, int dry_run)
 {
        int result = 0;
-       struct ref_states states;
+       struct ref_states states = REF_STATES_INIT;
        struct string_list refs_to_prune = STRING_LIST_INIT_NODUP;
        struct string_list_item *item;
        const char *dangling_msg = dry_run
                ? _(" %s will become dangling!")
                : _(" %s has become dangling!");
 
-       memset(&states, 0, sizeof(states));
        get_remote_ref_states(remote, &states, GET_REF_STATES);
 
        if (!states.stale.nr) {