Skip to content

Commit 0f1eb7d

Browse files
rscharfegitster
authored andcommitted
mergesort: remove llist_mergesort()
Now that all of its callers are gone, remove llist_mergesort(). Signed-off-by: René Scharfe <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 9b9f5f6 commit 0f1eb7d

File tree

3 files changed

+0
-90
lines changed

3 files changed

+0
-90
lines changed

Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -973,7 +973,6 @@ LIB_OBJS += merge-ort.o
973973
LIB_OBJS += merge-ort-wrappers.o
974974
LIB_OBJS += merge-recursive.o
975975
LIB_OBJS += merge.o
976-
LIB_OBJS += mergesort.o
977976
LIB_OBJS += midx.o
978977
LIB_OBJS += name-hash.o
979978
LIB_OBJS += negotiator/default.o

mergesort.c

-76
This file was deleted.

mergesort.h

-13
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,6 @@
11
#ifndef MERGESORT_H
22
#define MERGESORT_H
33

4-
/*
5-
* Sort linked list in place.
6-
* - get_next_fn() returns the next element given an element of a linked list.
7-
* - set_next_fn() takes two elements A and B, and makes B the "next" element
8-
* of A on the list.
9-
* - compare_fn() takes two elements A and B, and returns negative, 0, positive
10-
* as the same sign as "subtracting" B from A.
11-
*/
12-
void *llist_mergesort(void *list,
13-
void *(*get_next_fn)(const void *),
14-
void (*set_next_fn)(void *, void *),
15-
int (*compare_fn)(const void *, const void *));
16-
174
/* Combine two sorted lists. Take from `list` on equality. */
185
#define DEFINE_LIST_MERGE_INTERNAL(name, type) \
196
static type *name##__merge(type *list, type *other, \

0 commit comments

Comments
 (0)