aboutsummaryrefslogtreecommitdiff
path: root/test-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 /test-mergesort.c
parentfbc08ea177f8284d10c62ad39de51edb21af88b0 (diff)
downloadgit-7365c95d2d67cbbb74c2040918d2ecde06231d93.tar.gz
git-7365c95d2d67cbbb74c2040918d2ecde06231d93.tar.xz
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 'test-mergesort.c')
-rw-r--r--test-mergesort.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/test-mergesort.c b/test-mergesort.c
index 1dd82fd67..3f388b4ce 100644
--- a/test-mergesort.c
+++ b/test-mergesort.c
@@ -42,7 +42,7 @@ int main(int argc, const char **argv)
p = line;
}
- lines = mergesort(lines, get_next, set_next, compare_strings);
+ lines = llist_mergesort(lines, get_next, set_next, compare_strings);
while (lines) {
printf("%s", lines->text);