prune_remote(): iterate using for_each_string_list_item()

Iterate over refs_to_prune using for_each_string_list_item() rather
than writing out the loop in longhand.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/remote.c b/builtin/remote.c
index efbf5fb943d2cf0ce94136abf206442b464c11ce..7fec1702981da6b66fe9df4833af1a0ff14f2847 100644 (file)
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -1309,9 +1309,10 @@ static int set_head(int argc, const char **argv)
 
 static int prune_remote(const char *remote, int dry_run)
 {
 
 static int prune_remote(const char *remote, int dry_run)
 {

-       int result = 0, i;
+       int result = 0;

        struct ref_states states;
        struct string_list refs_to_prune = STRING_LIST_INIT_NODUP;
        struct ref_states states;
        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!");
        const char *dangling_msg = dry_run
                ? _(" %s will become dangling!")
                : _(" %s has become dangling!");


@@ -1330,11 +1331,8 @@ static int prune_remote(const char *remote, int dry_run)
                  ? states.remote->url[0]
                  : _("(no URL)"));
 
                  ? states.remote->url[0]
                  : _("(no URL)"));
 

-       for (i = 0; i < states.stale.nr; i++) {
-               const char *refname = states.stale.items[i].util;
-
-               string_list_append(&refs_to_prune, refname);
-       }
+       for_each_string_list_item(item, &states.stale)
+               string_list_append(&refs_to_prune, item->util);

        sort_string_list(&refs_to_prune);
 
        if (!dry_run) {
        sort_string_list(&refs_to_prune);
 
        if (!dry_run) {


@@ -1344,8 +1342,8 @@ static int prune_remote(const char *remote, int dry_run)
                strbuf_release(&err);
        }
 
                strbuf_release(&err);
        }
 

-       for (i = 0; i < states.stale.nr; i++) {
-               const char *refname = states.stale.items[i].util;
+       for_each_string_list_item(item, &states.stale) {
+               const char *refname = item->util;

 
                if (!dry_run)
                        result |= delete_ref(refname, NULL, 0);
 
                if (!dry_run)
                        result |= delete_ref(refname, NULL, 0);