From c3e9ee5e43c6d7adf6d5c9b74b39a5170cfe0b02 Mon Sep 17 00:00:00 2001 From: robotanarchy Date: Tue, 22 Dec 2015 00:38:18 +0100 Subject: replace non-standard qsort_r with qsort I've tried to make as few changes, as possible. Usually the reason for using qsort_r is, that you can pass an extra userdata pointer to the compare function. However, in sway list_sort wrapped qsort_r and always called a wrapper function for comparing, the wrapper function then had the real compare function as argument. The only thing, that the wrapper function does, is dereferencing the 'left' and 'right' function arguments before passing them to the real compare function. I have renamed list_sort to list_qsort to avoid confusion (so nobody tries to use list_qsort like list_sort) and removed the wrapper functionality. Now the dereferencing must be done in the compare function, that gets passed. Some compare functions were used in both list_sort and list_seq_find. To make the difference clear, I've added a '_qsort' suffix to the compare functions, that are intended to be used with the new list_qsort. (In other words: list_qsort is not compatible anymore with list_seq_find). - Changed and renamed function (it isn't used anywhere but in commands.c, and only for sorting): compare_set -> compare_set_qsort - New wrapper functions: sway_binding_cmp_qsort (for sway_binding_cmp) sway_mouse_binding_cmp_qsort (for sway_mouse_binding_cmp) --- common/list.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'common/list.c') diff --git a/common/list.c b/common/list.c index d6f6f2ea..850c8569 100644 --- a/common/list.c +++ b/common/list.c @@ -50,14 +50,8 @@ void list_cat(list_t *list, list_t *source) { } } -// pass the pointer of the object we care about to the comparison function -static int list_cmp(const void *l, const void *r, void *_cmp) { - int (*cmp)(const void *, const void *) = _cmp; - return cmp(*(void**)l, *(void**)r); -} - -void list_sort(list_t *list, int compare(const void *left, const void *right)) { - qsort_r(list->items, list->length, sizeof(void *), list_cmp, compare); +void list_qsort(list_t* list, int compare(const void *left, const void *right)) { + qsort(list->items, list->length, sizeof(void *), compare); } int list_seq_find(list_t *list, int compare(const void *item, const void *data), const void *data) { -- cgit v1.2.3-54-g00ecf