Commit 7365c95d authored by Junio C Hamano's avatar Junio C Hamano

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: default avatarJunio C Hamano <[email protected]>
parent fbc08ea1
...@@ -429,8 +429,8 @@ static void commit_list_set_next(void *a, void *next) ...@@ -429,8 +429,8 @@ static void commit_list_set_next(void *a, void *next)
void commit_list_sort_by_date(struct commit_list **list) void commit_list_sort_by_date(struct commit_list **list)
{ {
*list = mergesort(*list, commit_list_get_next, commit_list_set_next, *list = llist_mergesort(*list, commit_list_get_next, commit_list_set_next,
commit_list_compare_by_date); commit_list_compare_by_date);
} }
struct commit *pop_most_recent_commit(struct commit_list **list, struct commit *pop_most_recent_commit(struct commit_list **list,
......
...@@ -23,10 +23,10 @@ static void *pop_item(struct mergesort_sublist *l, ...@@ -23,10 +23,10 @@ static void *pop_item(struct mergesort_sublist *l,
return p; return p;
} }
void *mergesort(void *list, void *llist_mergesort(void *list,
void *(*get_next_fn)(const void *), void *(*get_next_fn)(const void *),
void (*set_next_fn)(void *, void *), void (*set_next_fn)(void *, void *),
int (*compare_fn)(const void *, const void *)) int (*compare_fn)(const void *, const void *))
{ {
unsigned long l; unsigned long l;
......
#ifndef MERGESORT_H #ifndef MERGESORT_H
#define MERGESORT_H #define MERGESORT_H
void *mergesort(void *list, /*
void *(*get_next_fn)(const void *), * Sort linked list in place.
void (*set_next_fn)(void *, void *), * - get_next_fn() returns the next element given an element of a linked list.
int (*compare_fn)(const void *, const void *)); * - set_next_fn() takes two elements A and B, and makes B the "next" element
* of A on the list.
* - compare_fn() takes two elements A and B, and returns negative, 0, positive
* as the same sign as "subtracting" B from A.
*/
void *llist_mergesort(void *list,
void *(*get_next_fn)(const void *),
void (*set_next_fn)(void *, void *),
int (*compare_fn)(const void *, const void *));
#endif #endif
...@@ -42,7 +42,7 @@ int main(int argc, const char **argv) ...@@ -42,7 +42,7 @@ int main(int argc, const char **argv)
p = line; p = line;
} }
lines = mergesort(lines, get_next, set_next, compare_strings); lines = llist_mergesort(lines, get_next, set_next, compare_strings);
while (lines) { while (lines) {
printf("%s", lines->text); printf("%s", lines->text);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment