From 7365c95d2d67cbbb74c2040918d2ecde06231d93 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 17 Apr 2012 11:07:01 -0700 Subject: mergesort: rename it to llist_mergesort() Even though the function is generic enough, sort() inherits connotations from the standard function qsort() that sorts an array. Rename it to llist_mergesort() and describe the external interface in its header file. This incidentally avoids name clashes with mergesort() some platforms declare in, and contaminate user namespace with, their . Reported-by: Brian Gernhardt Signed-off-by: Junio C Hamano --- commit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'commit.c') diff --git a/commit.c b/commit.c index 0759b2ca65..84304c00ff 100644 --- a/commit.c +++ b/commit.c @@ -429,8 +429,8 @@ static void commit_list_set_next(void *a, void *next) void commit_list_sort_by_date(struct commit_list **list) { - *list = mergesort(*list, commit_list_get_next, commit_list_set_next, - commit_list_compare_by_date); + *list = llist_mergesort(*list, commit_list_get_next, commit_list_set_next, + commit_list_compare_by_date); } struct commit *pop_most_recent_commit(struct commit_list **list, -- cgit v1.2.3