mirror of
https://github.com/swaywm/sway.git
synced 2024-07-03 01:23:35 +00:00
c3e9ee5e43
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)
66 lines
1.5 KiB
C
66 lines
1.5 KiB
C
#include "list.h"
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
list_t *create_list(void) {
|
|
list_t *list = malloc(sizeof(list_t));
|
|
list->capacity = 10;
|
|
list->length = 0;
|
|
list->items = malloc(sizeof(void*) * list->capacity);
|
|
return list;
|
|
}
|
|
|
|
static void list_resize(list_t *list) {
|
|
if (list->length == list->capacity) {
|
|
list->capacity += 10;
|
|
list->items = realloc(list->items, sizeof(void*) * list->capacity);
|
|
}
|
|
}
|
|
|
|
void list_free(list_t *list) {
|
|
if (list == NULL) {
|
|
return;
|
|
}
|
|
free(list->items);
|
|
free(list);
|
|
}
|
|
|
|
void list_add(list_t *list, void *item) {
|
|
list_resize(list);
|
|
list->items[list->length++] = item;
|
|
}
|
|
|
|
void list_insert(list_t *list, int index, void *item) {
|
|
list_resize(list);
|
|
memmove(&list->items[index + 1], &list->items[index], sizeof(void*) * (list->length - index));
|
|
list->length++;
|
|
list->items[index] = item;
|
|
}
|
|
|
|
void list_del(list_t *list, int index) {
|
|
list->length--;
|
|
memmove(&list->items[index], &list->items[index + 1], sizeof(void*) * (list->length - index));
|
|
}
|
|
|
|
void list_cat(list_t *list, list_t *source) {
|
|
int i;
|
|
for (i = 0; i < source->length; ++i) {
|
|
list_add(list, source->items[i]);
|
|
}
|
|
}
|
|
|
|
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) {
|
|
for (int i = 0; i < list->length; i++) {
|
|
void *item = list->items[i];
|
|
if (compare(item, data) == 0) {
|
|
return i;
|
|
}
|
|
}
|
|
return -1;
|
|
}
|