summaryrefslogtreecommitdiff
path: root/line-log.c
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2014-07-17 01:52:09 +0200
committerJunio C Hamano <gitster@pobox.com>2014-07-17 13:36:25 -0700
commit4bbaa1eb6fb4a520069e53ec5afa977a316a5d36 (patch)
treeceb6d1a97ca5a3a78bb057b889b02fccaa4290fa /line-log.c
parentcedc61a99804db99f9a658c3cccd5c2786a28501 (diff)
downloadgit-4bbaa1eb6fb4a520069e53ec5afa977a316a5d36.tar.gz
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 'line-log.c')
-rw-r--r--line-log.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/line-log.c b/line-log.c
index afcc98db93..1008e72258 100644
--- 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)
{
@@ -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;
- int nparents = count_parents(commit);
+ int nparents = commit_list_count(commit->parents);
diffqueues = xmalloc(nparents * sizeof(*diffqueues));
cand = xmalloc(nparents * sizeof(*cand));