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 --- mergesort.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mergesort.c') diff --git a/mergesort.c b/mergesort.c index d084c602d5..e5fdf2ee4a 100644 --- a/mergesort.c +++ b/mergesort.c @@ -23,10 +23,10 @@ static void *pop_item(struct mergesort_sublist *l, return p; } -void *mergesort(void *list, - void *(*get_next_fn)(const void *), - void (*set_next_fn)(void *, void *), - int (*compare_fn)(const void *, const void *)) +void *llist_mergesort(void *list, + void *(*get_next_fn)(const void *), + void (*set_next_fn)(void *, void *), + int (*compare_fn)(const void *, const void *)) { unsigned long l; -- cgit v1.2.1