Re: test-mergesort conflict with stdlib.h
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 17, 2012, 18:06 UTC
- Message-ID
- <7v8vhunsg5.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <7vd376ntem.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
> Unfortunate. OS X shouldn't contaminate the user namespace by adding such > names in stdlib.h (which incidentally has qsort()), but the damage is done > already, so I am not opposed to rename it to llist_mergesort() or something.
Something like this. While we are touching the code, let's add some documentation to the header.
commit.c | 4 ++-- mergesort.c | 8 ++++---- mergesort.h | 16 ++++++++++++---- test-mergesort.c | 2 +- 4 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/commit.c b/commit.c index 0759b2c..84304c0 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, diff --git a/mergesort.c b/mergesort.c index d084c60..e5fdf2e 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; diff --git a/mergesort.h b/mergesort.h index d6e5f4a..644cff1 100644 --- a/mergesort.h +++ b/mergesort.h @@ -1,9 +1,17 @@ #ifndef MERGESORT_H #define MERGESORT_H -void *mergesort(void *list, - void *(*get_next_fn)(const void *), - void (*set_next_fn)(void *, void *), - int (*compare_fn)(const void *, const void *)); +/* + * Sort linked list in place. + * - get_next_fn() returns the next element given an element of a linked list. + * - 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 diff --git a/test-mergesort.c b/test-mergesort.c index 1dd82fd..3f388b4 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);