aboutsummaryrefslogtreecommitdiffstats
path: root/include/config.h
diff options
context:
space:
mode:
authorLibravatar robotanarchy <robotanarchy@bingo-ev.de>2015-12-22 00:38:18 +0100
committerLibravatar robotanarchy <robotanarchy@bingo-ev.de>2015-12-22 00:38:18 +0100
commitc3e9ee5e43c6d7adf6d5c9b74b39a5170cfe0b02 (patch)
tree14ce5f51e8cbea387e588697088659ec41173a53 /include/config.h
parentfix backtrace detection in CMake (diff)
downloadsway-c3e9ee5e43c6d7adf6d5c9b74b39a5170cfe0b02.tar.gz
sway-c3e9ee5e43c6d7adf6d5c9b74b39a5170cfe0b02.tar.zst
sway-c3e9ee5e43c6d7adf6d5c9b74b39a5170cfe0b02.zip
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)
Diffstat (limited to 'include/config.h')
-rw-r--r--include/config.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/config.h b/include/config.h
index b97acb57..a915fbed 100644
--- a/include/config.h
+++ b/include/config.h
@@ -179,10 +179,12 @@ void free_output_config(struct output_config *oc);
179int workspace_output_cmp_workspace(const void *a, const void *b); 179int workspace_output_cmp_workspace(const void *a, const void *b);
180 180
181int sway_binding_cmp(const void *a, const void *b); 181int sway_binding_cmp(const void *a, const void *b);
182int sway_binding_cmp_qsort(const void *a, const void *b);
182int sway_binding_cmp_keys(const void *a, const void *b); 183int sway_binding_cmp_keys(const void *a, const void *b);
183void free_sway_binding(struct sway_binding *sb); 184void free_sway_binding(struct sway_binding *sb);
184 185
185int sway_mouse_binding_cmp(const void *a, const void *b); 186int sway_mouse_binding_cmp(const void *a, const void *b);
187int sway_mouse_binding_cmp_qsort(const void *a, const void *b);
186int sway_mouse_binding_cmp_buttons(const void *a, const void *b); 188int sway_mouse_binding_cmp_buttons(const void *a, const void *b);
187void free_sway_mouse_binding(struct sway_mouse_binding *smb); 189void free_sway_mouse_binding(struct sway_mouse_binding *smb);
188 190