diff options
| author |  René Scharfe <l.s.r@web.de> | 2014-07-17 01:52:09 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-07-17 13:36:25 -0700 |
| commit | 4bbaa1eb6fb4a520069e53ec5afa977a316a5d36 (patch) | |
| tree | ceb6d1a97ca5a3a78bb057b889b02fccaa4290fa /builtin | |
| parent | strbuf: use strbuf_addstr() for adding C strings (diff) | |
| download | tgif-4bbaa1eb6fb4a520069e53ec5afa977a316a5d36.tar.xz | |
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>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/blame.c | 5 | ||||
| -rw-r--r-- | builtin/for-each-ref.c | 16 |
2 files changed, 3 insertions, 18 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index d3b256e545..75b3a028a7 100644 --- 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) { - int cnt; 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 diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index 4135980f20..47bd624696 100644 --- 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) { @@ -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); - 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")) { - int num = num_parents(commit); + int num = commit_list_count(commit->parents); int i; struct commit_list *parents; char *s = xmalloc(41 * num + 1); |