summaryrefslogtreecommitdiff
path: root/mergesort.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-04-17 11:07:01 -0700
committerJunio C Hamano <gitster@pobox.com>2012-04-17 11:07:01 -0700
commit7365c95d2d67cbbb74c2040918d2ecde06231d93 (patch)
tree59eeaaaf0a202c7860d784643e86bd9fb32cb52c /mergesort.c
parentfbc08ea177f8284d10c62ad39de51edb21af88b0 (diff)
downloadgit-7365c95d2d67cbbb74c2040918d2ecde06231d93.tar.gz
mergesort: rename it to llist_mergesort()
Even though the function is generic enough, <anything>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 <stdlib.h>. Reported-by: Brian Gernhardt Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergesort.c')
-rw-r--r--mergesort.c8
1 files changed, 4 insertions, 4 deletions
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;