use commit_list_count() to count the members of commit_lists

Call commit_list_count() instead of open-coding it repeatedly.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/blame.c b/builtin/blame.c
index d3b256e545a76b096682223539c4faec8d770b2f..75b3a028a729f2fa447d8c0d81e21c08ba25977d 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -1371,11 +1371,8 @@ static struct commit_list *first_scapegoat(struct rev_info *revs, struct commit
 
 static int num_scapegoats(struct rev_info *revs, struct commit *commit)
 {
 
 static int num_scapegoats(struct rev_info *revs, struct commit *commit)
 {

-       int cnt;

        struct commit_list *l = first_scapegoat(revs, commit);
        struct commit_list *l = first_scapegoat(revs, commit);

-       for (cnt = 0; l; l = l->next)
-               cnt++;
-       return cnt;
+       return commit_list_count(l);

 }
 
 /* Distribute collected unsorted blames to the respected sorted lists
 }
 
 /* Distribute collected unsorted blames to the respected sorted lists

diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index 4135980f20786ef3320e334c4001fd67fc169056..47bd624696d5e94295dda8846f00dcbb80a6ca5a 100644 (file)
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -283,18 +283,6 @@ static void grab_tag_values(struct atom_value *val, int deref, struct object *ob
        }
 }
 
        }
 }
 

-static int num_parents(struct commit *commit)
-{
-       struct commit_list *parents;
-       int i;
-
-       for (i = 0, parents = commit->parents;
-            parents;
-            parents = parents->next)
-               i++;
-       return i;
-}
-

 /* See grab_values */
 static void grab_commit_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)
 {
 /* See grab_values */
 static void grab_commit_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)
 {


@@ -315,12 +303,12 @@ static void grab_commit_values(struct atom_value *val, int deref, struct object
                }
                if (!strcmp(name, "numparent")) {
                        char *s = xmalloc(40);
                }
                if (!strcmp(name, "numparent")) {
                        char *s = xmalloc(40);

-                       v->ul = num_parents(commit);
+                       v->ul = commit_list_count(commit->parents);

                        sprintf(s, "%lu", v->ul);
                        v->s = s;
                }
                else if (!strcmp(name, "parent")) {
                        sprintf(s, "%lu", v->ul);
                        v->s = s;
                }
                else if (!strcmp(name, "parent")) {

-                       int num = num_parents(commit);
+                       int num = commit_list_count(commit->parents);

                        int i;
                        struct commit_list *parents;
                        char *s = xmalloc(41 * num + 1);
                        int i;
                        struct commit_list *parents;
                        char *s = xmalloc(41 * num + 1);

diff --git a/commit.c b/commit.c
index 61d2e13f4870a47be3f48b7cebeee8ba4ceaee1b..464a139e611343742a0d9c2540428d138439f462 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -987,12 +987,7 @@ struct commit_list *get_merge_bases_many(struct commit *one,
        }
 
        /* There are more than one */
        }
 
        /* There are more than one */

-       cnt = 0;
-       list = result;
-       while (list) {
-               list = list->next;
-               cnt++;
-       }
+       cnt = commit_list_count(result);

        rslt = xcalloc(cnt, sizeof(*rslt));
        for (list = result, i = 0; list; list = list->next)
                rslt[i++] = list->item;
        rslt = xcalloc(cnt, sizeof(*rslt));
        for (list = result, i = 0; list; list = list->next)
                rslt[i++] = list->item;

diff --git a/line-log.c b/line-log.c
index afcc98db930a36358283ff199a428b6c5bbbaf8f..1008e722584c882ac86b936307ace701b9225aaf 100644 (file)
--- a/line-log.c
+++ b/line-log.c
@@ -766,17 +766,6 @@ void line_log_init(struct rev_info *rev, const char *prefix, struct string_list
        }
 }
 
        }
 }
 

-static int count_parents(struct commit *commit)
-{
-       struct commit_list *parents = commit->parents;
-       int count = 0;
-       while (parents) {
-               count++;
-               parents = parents->next;
-       }
-       return count;
-}
-

 static void move_diff_queue(struct diff_queue_struct *dst,
                            struct diff_queue_struct *src)
 {
 static void move_diff_queue(struct diff_queue_struct *dst,
                            struct diff_queue_struct *src)
 {


@@ -1150,7 +1139,7 @@ static int process_ranges_merge_commit(struct rev_info *rev, struct commit *comm
        struct commit **parents;
        struct commit_list *p;
        int i;
        struct commit **parents;
        struct commit_list *p;
        int i;

-       int nparents = count_parents(commit);
+       int nparents = commit_list_count(commit->parents);

 
        diffqueues = xmalloc(nparents * sizeof(*diffqueues));
        cand = xmalloc(nparents * sizeof(*cand));
 
        diffqueues = xmalloc(nparents * sizeof(*diffqueues));
        cand = xmalloc(nparents * sizeof(*cand));

diff --git a/pretty.c b/pretty.c
index 6e5493472302dcf452f21c6b6010a3af71a060f6..ac800fa452cb854e15671926052350f257118f6a 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -1556,12 +1556,7 @@ static void pp_header(struct pretty_print_context *pp,
                }
 
                if (!parents_shown) {
                }
 
                if (!parents_shown) {

-                       struct commit_list *parent;
-                       int num;
-                       for (parent = commit->parents, num = 0;
-                            parent;
-                            parent = parent->next, num++)
-                               ;
+                       unsigned num = commit_list_count(commit->parents);

                        /* with enough slop */
                        strbuf_grow(sb, num * 50 + 20);
                        add_merge_info(pp, sb, commit);
                        /* with enough slop */
                        strbuf_grow(sb, num * 50 + 20);
                        add_merge_info(pp, sb, commit);