From 19e831ed3da2aba75d56e46c57967bcc60442d57 Mon Sep 17 00:00:00 2001 From: Ian Fan Date: Sat, 8 Dec 2018 22:52:29 +0000 Subject: [PATCH 1/3] list.c: Remove list_foreach Most occurrences have been replaced by `free_flat_list` which has been moved from stringop.c to list.c. The rest have been replaced by for loops. --- common/list.c | 21 ++++++++++++--------- common/loop.c | 6 ++---- common/stringop.c | 8 -------- include/list.h | 7 ++++++- include/stringop.h | 1 - sway/commands/bind.c | 4 +--- sway/commands/reload.c | 7 ++----- sway/config.c | 9 +++------ sway/config/bar.c | 4 +--- sway/tree/container.c | 8 +++++--- swayidle/main.c | 19 +++++++------------ 11 files changed, 39 insertions(+), 55 deletions(-) diff --git a/common/list.c b/common/list.c index ee268c9a..a0b42512 100644 --- a/common/list.c +++ b/common/list.c @@ -30,15 +30,6 @@ void list_free(list_t *list) { free(list); } -void list_foreach(list_t *list, void (*callback)(void *item)) { - if (list == NULL || callback == NULL) { - return; - } - for (int i = 0; i < list->length; i++) { - callback(list->items[i]); - } -} - void list_add(list_t *list, void *item) { list_resize(list); list->items[list->length++] = item; @@ -156,3 +147,15 @@ void list_stable_sort(list_t *list, int compare(const void *a, const void *b)) { list_inplace_sort(list, 0, list->length - 1, compare); } } + +void free_flat_list(list_t *list) { + if (!list) { + return; + } + + for (int i = 0; i < list->length; ++i) { + free(list->items[i]); + } + list_free(list); +} + diff --git a/common/loop.c b/common/loop.c index 82b80017..ad2b4a64 100644 --- a/common/loop.c +++ b/common/loop.c @@ -45,10 +45,8 @@ struct loop *loop_create(void) { } void loop_destroy(struct loop *loop) { - list_foreach(loop->fd_events, free); - list_foreach(loop->timers, free); - list_free(loop->fd_events); - list_free(loop->timers); + free_flat_list(loop->fd_events); + free_flat_list(loop->timers); free(loop->fds); free(loop); } diff --git a/common/stringop.c b/common/stringop.c index df016e9d..4b8c9a38 100644 --- a/common/stringop.c +++ b/common/stringop.c @@ -97,14 +97,6 @@ list_t *split_string(const char *str, const char *delims) { return res; } -void free_flat_list(list_t *list) { - int i; - for (i = 0; i < list->length; ++i) { - free(list->items[i]); - } - list_free(list); -} - char **split_args(const char *start, int *argc) { *argc = 0; int alloc = 2; diff --git a/include/list.h b/include/list.h index 03851a82..70af49f6 100644 --- a/include/list.h +++ b/include/list.h @@ -9,7 +9,6 @@ typedef struct { list_t *create_list(void); void list_free(list_t *list); -void list_foreach(list_t *list, void (*callback)(void* item)); void list_add(list_t *list, void *item); void list_insert(list_t *list, int index, void *item); void list_del(list_t *list, int index); @@ -27,4 +26,10 @@ void list_stable_sort(list_t *list, int compare(const void *a, const void *b)); void list_swap(list_t *list, int src, int dest); // move item to end of list void list_move_to_end(list_t *list, void *item); + +/* Calls `free` for each item in the list, then frees the list. + * Do not use this to free lists of primitives or items that require more + * complicated deallocation code. + */ +void free_flat_list(list_t *list); #endif diff --git a/include/stringop.h b/include/stringop.h index 919e605c..215f7916 100644 --- a/include/stringop.h +++ b/include/stringop.h @@ -19,7 +19,6 @@ int lenient_strcmp(char *a, char *b); // Simply split a string with delims, free with `free_flat_list` list_t *split_string(const char *str, const char *delims); -void free_flat_list(list_t *list); // Splits an argument string, keeping quotes intact char **split_args(const char *str, int *argc); diff --git a/sway/commands/bind.c b/sway/commands/bind.c index c8b634b9..52a245fa 100644 --- a/sway/commands/bind.c +++ b/sway/commands/bind.c @@ -23,9 +23,7 @@ void free_sway_binding(struct sway_binding *binding) { return; } - if (binding->keys) { - free_flat_list(binding->keys); - } + free_flat_list(binding->keys); free(binding->input); free(binding->command); free(binding); diff --git a/sway/commands/reload.c b/sway/commands/reload.c index c64de4bd..c236911e 100644 --- a/sway/commands/reload.c +++ b/sway/commands/reload.c @@ -24,8 +24,7 @@ static void do_reload(void *data) { if (!load_main_config(config->current_config_path, true, false)) { wlr_log(WLR_ERROR, "Error(s) reloading config"); - list_foreach(bar_ids, free); - list_free(bar_ids); + free_flat_list(bar_ids); return; } @@ -42,9 +41,7 @@ static void do_reload(void *data) { } } } - - list_foreach(bar_ids, free); - list_free(bar_ids); + free_flat_list(bar_ids); config_update_font_height(true); root_for_each_container(rebuild_textures_iterator, NULL); diff --git a/sway/config.c b/sway/config.c index ff7de4b9..efb95e31 100644 --- a/sway/config.c +++ b/sway/config.c @@ -654,8 +654,7 @@ bool read_config(FILE *file, struct sway_config *config, if (read + length > config_size) { wlr_log(WLR_ERROR, "Config file changed during reading"); - list_foreach(stack, free); - list_free(stack); + free_flat_list(stack); free(line); return false; } @@ -684,8 +683,7 @@ bool read_config(FILE *file, struct sway_config *config, } char *expanded = expand_line(block, line, brace_detected > 0); if (!expanded) { - list_foreach(stack, free); - list_free(stack); + free_flat_list(stack); free(line); return false; } @@ -750,8 +748,7 @@ bool read_config(FILE *file, struct sway_config *config, free(line); free_cmd_results(res); } - list_foreach(stack, free); - list_free(stack); + free_flat_list(stack); config->current_config_line_number = 0; config->current_config_line = NULL; diff --git a/sway/config/bar.c b/sway/config/bar.c index 36e10527..82457ef4 100644 --- a/sway/config/bar.c +++ b/sway/config/bar.c @@ -53,9 +53,7 @@ void free_bar_config(struct bar_config *bar) { free_bar_binding(binding); } list_free(bar->bindings); - if (bar->outputs) { - free_flat_list(bar->outputs); - } + free_flat_list(bar->outputs); if (bar->pid != 0) { terminate_swaybar(bar->pid); } diff --git a/sway/tree/container.c b/sway/tree/container.c index 91e8dd7f..ac433577 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -21,6 +21,7 @@ #include "sway/tree/arrange.h" #include "sway/tree/view.h" #include "sway/tree/workspace.h" +#include "list.h" #include "log.h" #include "stringop.h" @@ -67,8 +68,7 @@ void container_destroy(struct sway_container *con) { list_free(con->current.children); list_free(con->outputs); - list_foreach(con->marks, free); - list_free(con->marks); + free_flat_list(con->marks); wlr_texture_destroy(con->marks_focused); wlr_texture_destroy(con->marks_focused_inactive); wlr_texture_destroy(con->marks_unfocused); @@ -1267,7 +1267,9 @@ bool container_find_and_unmark(char *mark) { } void container_clear_marks(struct sway_container *con) { - list_foreach(con->marks, free); + for (int i = 0; i < con->marks->length; ++i) { + free(con->marks->items[i]); + } con->marks->length = 0; ipc_event_window(con, "mark"); } diff --git a/swayidle/main.c b/swayidle/main.c index dd7d9de3..9a76e58c 100644 --- a/swayidle/main.c +++ b/swayidle/main.c @@ -365,11 +365,6 @@ static int parse_args(int argc, char *argv[]) { return 0; } -static void register_zero_idle_timeout(void *item) { - struct swayidle_timeout_cmd *cmd = item; - register_timeout(cmd, 0); -} - static int handle_signal(int sig, void *data) { switch (sig) { case SIGINT: @@ -378,7 +373,9 @@ static int handle_signal(int sig, void *data) { return 0; case SIGUSR1: wlr_log(WLR_DEBUG, "Got SIGUSR1"); - list_foreach(state.timeout_cmds, register_zero_idle_timeout); + for (int i = 0; i < state.timeout_cmds->length; ++i) { + register_timeout(state.timeout_cmds->items[i], 0); + } return 1; } assert(false); // not reached @@ -409,11 +406,6 @@ static int display_event(int fd, uint32_t mask, void *data) { return count; } -static void register_idle_timeout(void *item) { - struct swayidle_timeout_cmd *cmd = item; - register_timeout(cmd, cmd->timeout); -} - int main(int argc, char *argv[]) { if (parse_args(argc, argv) != 0) { return -1; @@ -458,7 +450,10 @@ int main(int argc, char *argv[]) { sway_terminate(0); } - list_foreach(state.timeout_cmds, register_idle_timeout); + for (int i = 0; i < state.timeout_cmds->length; ++i) { + struct swayidle_timeout_cmd *cmd = state.timeout_cmds->items[i]; + register_timeout(cmd, cmd->timeout); + } wl_display_roundtrip(state.display); From c8776fac4232f9faab0a78ef3e18dc4366496421 Mon Sep 17 00:00:00 2001 From: Ian Fan Date: Sat, 8 Dec 2018 23:55:14 +0000 Subject: [PATCH 2/3] Cleanup list code --- common/list.c | 3 +-- sway/commands.c | 3 +-- sway/commands/bar/modifier.c | 1 - sway/commands/bind.c | 8 ++------ sway/config.c | 8 +++----- sway/config/bar.c | 3 +-- sway/config/seat.c | 5 +---- sway/ipc-server.c | 7 ++----- sway/main.c | 5 ++--- swaynag/swaynag.c | 5 ++--- swaynag/types.c | 6 ++---- 11 files changed, 17 insertions(+), 37 deletions(-) diff --git a/common/list.c b/common/list.c index a0b42512..2a803702 100644 --- a/common/list.c +++ b/common/list.c @@ -48,8 +48,7 @@ void list_del(list_t *list, int index) { } void list_cat(list_t *list, list_t *source) { - int i; - for (i = 0; i < source->length; ++i) { + for (int i = 0; i < source->length; ++i) { list_add(list, source->items[i]); } } diff --git a/sway/commands.c b/sway/commands.c index d5cab655..f6d1cc3e 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -43,8 +43,7 @@ struct cmd_results *checkarg(int argc, const char *name, enum expected_args type } void apply_seat_config(struct seat_config *seat_config) { - int i; - i = list_seq_find(config->seat_configs, seat_name_cmp, seat_config->name); + int i = list_seq_find(config->seat_configs, seat_name_cmp, seat_config->name); if (i >= 0) { // merge existing config struct seat_config *sc = config->seat_configs->items[i]; diff --git a/sway/commands/bar/modifier.c b/sway/commands/bar/modifier.c index 09025fff..1b3e7492 100644 --- a/sway/commands/bar/modifier.c +++ b/sway/commands/bar/modifier.c @@ -20,7 +20,6 @@ struct cmd_results *bar_cmd_modifier(int argc, char **argv) { uint32_t tmp_mod; if ((tmp_mod = get_modifier_mask_by_name(split->items[i])) > 0) { mod |= tmp_mod; - continue; } else { error = cmd_results_new(CMD_INVALID, "modifier", "Unknown modifier '%s'", split->items[i]); diff --git a/sway/commands/bind.c b/sway/commands/bind.c index 52a245fa..886a262c 100644 --- a/sway/commands/bind.c +++ b/sway/commands/bind.c @@ -78,7 +78,6 @@ static int key_qsort_cmp(const void *keyp_a, const void *keyp_b) { return (key_a < key_b) ? -1 : ((key_a > key_b) ? 1 : 0); } - /** * From a keycode, bindcode, or bindsym name and the most likely binding type, * identify the appropriate numeric value corresponding to the key. Return NULL @@ -278,7 +277,6 @@ static struct cmd_results *cmd_bindsym_or_bindcode(int argc, char **argv, wlr_log(WLR_DEBUG, "%s - Bound %s to command `%s` for device '%s'", bindtype, argv[0], binding->command, binding->input); return cmd_results_new(CMD_SUCCESS, NULL, NULL); - } struct cmd_results *cmd_bindsym(int argc, char **argv) { @@ -289,7 +287,6 @@ struct cmd_results *cmd_bindcode(int argc, char **argv) { return cmd_bindsym_or_bindcode(argc, argv, true); } - /** * Execute the command associated to a binding */ @@ -299,15 +296,14 @@ void seat_execute_command(struct sway_seat *seat, struct sway_binding *binding) config->handler_context.seat = seat; list_t *res_list = execute_command(binding->command, NULL, NULL); bool success = true; - while (res_list->length) { - struct cmd_results *results = res_list->items[0]; + for (int i = 0; i < res_list->length; ++i) { + struct cmd_results *results = res_list->items[i]; if (results->status != CMD_SUCCESS) { wlr_log(WLR_DEBUG, "could not run command for binding: %s (%s)", binding->command, results->error); success = false; } free_cmd_results(results); - list_del(res_list, 0); } list_free(res_list); if (success) { diff --git a/sway/config.c b/sway/config.c index efb95e31..4621cad9 100644 --- a/sway/config.c +++ b/sway/config.c @@ -38,26 +38,24 @@ struct sway_config *config = NULL; static void free_mode(struct sway_mode *mode) { - int i; - if (!mode) { return; } free(mode->name); if (mode->keysym_bindings) { - for (i = 0; i < mode->keysym_bindings->length; i++) { + for (int i = 0; i < mode->keysym_bindings->length; i++) { free_sway_binding(mode->keysym_bindings->items[i]); } list_free(mode->keysym_bindings); } if (mode->keycode_bindings) { - for (i = 0; i < mode->keycode_bindings->length; i++) { + for (int i = 0; i < mode->keycode_bindings->length; i++) { free_sway_binding(mode->keycode_bindings->items[i]); } list_free(mode->keycode_bindings); } if (mode->mouse_bindings) { - for (i = 0; i < mode->mouse_bindings->length; i++) { + for (int i = 0; i < mode->mouse_bindings->length; i++) { free_sway_binding(mode->mouse_bindings->items[i]); } list_free(mode->mouse_bindings); diff --git a/sway/config/bar.c b/sway/config/bar.c index 82457ef4..fc773026 100644 --- a/sway/config/bar.c +++ b/sway/config/bar.c @@ -49,8 +49,7 @@ void free_bar_config(struct bar_config *bar) { free(bar->font); free(bar->separator_symbol); for (int i = 0; i < bar->bindings->length; i++) { - struct bar_binding *binding = bar->bindings->items[i]; - free_bar_binding(binding); + free_bar_binding(bar->bindings->items[i]); } list_free(bar->bindings); free_flat_list(bar->outputs); diff --git a/sway/config/seat.c b/sway/config/seat.c index 56fa6095..1cb4c363 100644 --- a/sway/config/seat.c +++ b/sway/config/seat.c @@ -117,11 +117,8 @@ void free_seat_config(struct seat_config *seat) { free(seat->name); for (int i = 0; i < seat->attachments->length; ++i) { - struct seat_attachment_config *attachment = - seat->attachments->items[i]; - seat_attachment_config_free(attachment); + seat_attachment_config_free(seat->attachments->items[i]); } - list_free(seat->attachments); free(seat); } diff --git a/sway/ipc-server.c b/sway/ipc-server.c index b3954259..2c642a37 100644 --- a/sway/ipc-server.c +++ b/sway/ipc-server.c @@ -73,14 +73,11 @@ static void handle_display_destroy(struct wl_listener *listener, void *data) { unlink(ipc_sockaddr->sun_path); while (ipc_client_list->length) { - struct ipc_client *client = ipc_client_list->items[0]; - ipc_client_disconnect(client); + ipc_client_disconnect(ipc_client_list->items[ipc_client_list->length-1]); } list_free(ipc_client_list); - if (ipc_sockaddr) { - free(ipc_sockaddr); - } + free(ipc_sockaddr); wl_list_remove(&ipc_display_destroy.link); } diff --git a/sway/main.c b/sway/main.c index a74183fe..f70e751d 100644 --- a/sway/main.c +++ b/sway/main.c @@ -393,13 +393,12 @@ int main(int argc, char **argv) { while (config->cmd_queue->length) { char *line = config->cmd_queue->items[0]; list_t *res_list = execute_command(line, NULL, NULL); - while (res_list->length) { - struct cmd_results *res = res_list->items[0]; + for (int i = 0; i < res_list->length; ++i) { + struct cmd_results *res = res_list->items[i]; if (res->status != CMD_SUCCESS) { wlr_log(WLR_ERROR, "Error on line '%s': %s", line, res->error); } free_cmd_results(res); - list_del(res_list, 0); } list_free(res_list); free(line); diff --git a/swaynag/swaynag.c b/swaynag/swaynag.c index a2a0b412..e6dfd25f 100644 --- a/swaynag/swaynag.c +++ b/swaynag/swaynag.c @@ -407,9 +407,8 @@ void swaynag_destroy(struct swaynag *swaynag) { swaynag->run_display = false; free(swaynag->message); - while (swaynag->buttons->length) { - struct swaynag_button *button = swaynag->buttons->items[0]; - list_del(swaynag->buttons, 0); + for (int i = 0; i < swaynag->buttons->length; ++i) { + struct swaynag_button *button = swaynag->buttons->items[i]; free(button->text); free(button->action); free(button); diff --git a/swaynag/types.c b/swaynag/types.c index 129644b7..bc17bd33 100644 --- a/swaynag/types.c +++ b/swaynag/types.c @@ -147,10 +147,8 @@ void swaynag_type_free(struct swaynag_type *type) { } void swaynag_types_free(list_t *types) { - while (types->length) { - struct swaynag_type *type = types->items[0]; - swaynag_type_free(type); - list_del(types, 0); + for (int i = 0; i < types->length; ++i) { + swaynag_type_free(types->items[i]); } list_free(types); } From 98c1e19466c0d83c8e1ca86eda5b273eda7eff3c Mon Sep 17 00:00:00 2001 From: Ian Fan Date: Sun, 9 Dec 2018 01:15:23 +0000 Subject: [PATCH 3/3] list.c: rename free_flat_list to list_free_items_and_destroy --- common/list.c | 2 +- common/loop.c | 4 ++-- include/list.h | 2 +- include/stringop.h | 2 +- sway/commands/bar/modifier.c | 4 ++-- sway/commands/bind.c | 6 +++--- sway/commands/reload.c | 4 ++-- sway/commands/workspace.c | 2 +- sway/config.c | 8 ++++---- sway/config/bar.c | 2 +- sway/tree/container.c | 2 +- sway/tree/workspace.c | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/common/list.c b/common/list.c index 2a803702..9805ceec 100644 --- a/common/list.c +++ b/common/list.c @@ -147,7 +147,7 @@ void list_stable_sort(list_t *list, int compare(const void *a, const void *b)) { } } -void free_flat_list(list_t *list) { +void list_free_items_and_destroy(list_t *list) { if (!list) { return; } diff --git a/common/loop.c b/common/loop.c index ad2b4a64..295f3a30 100644 --- a/common/loop.c +++ b/common/loop.c @@ -45,8 +45,8 @@ struct loop *loop_create(void) { } void loop_destroy(struct loop *loop) { - free_flat_list(loop->fd_events); - free_flat_list(loop->timers); + list_free_items_and_destroy(loop->fd_events); + list_free_items_and_destroy(loop->timers); free(loop->fds); free(loop); } diff --git a/include/list.h b/include/list.h index 70af49f6..895f6cc0 100644 --- a/include/list.h +++ b/include/list.h @@ -31,5 +31,5 @@ void list_move_to_end(list_t *list, void *item); * Do not use this to free lists of primitives or items that require more * complicated deallocation code. */ -void free_flat_list(list_t *list); +void list_free_items_and_destroy(list_t *list); #endif diff --git a/include/stringop.h b/include/stringop.h index 215f7916..d1bfa29d 100644 --- a/include/stringop.h +++ b/include/stringop.h @@ -17,7 +17,7 @@ char *lenient_strncat(char *dest, const char *src, size_t len); // strcmp that also handles null pointers. int lenient_strcmp(char *a, char *b); -// Simply split a string with delims, free with `free_flat_list` +// Simply split a string with delims, free with `list_free_items_and_destroy` list_t *split_string(const char *str, const char *delims); // Splits an argument string, keeping quotes intact diff --git a/sway/commands/bar/modifier.c b/sway/commands/bar/modifier.c index 1b3e7492..b5a16f45 100644 --- a/sway/commands/bar/modifier.c +++ b/sway/commands/bar/modifier.c @@ -23,11 +23,11 @@ struct cmd_results *bar_cmd_modifier(int argc, char **argv) { } else { error = cmd_results_new(CMD_INVALID, "modifier", "Unknown modifier '%s'", split->items[i]); - free_flat_list(split); + list_free_items_and_destroy(split); return error; } } - free_flat_list(split); + list_free_items_and_destroy(split); config->current_bar->modifier = mod; wlr_log(WLR_DEBUG, "Show/Hide the bar when pressing '%s' in hide mode.", argv[0]); diff --git a/sway/commands/bind.c b/sway/commands/bind.c index 886a262c..01a35cf2 100644 --- a/sway/commands/bind.c +++ b/sway/commands/bind.c @@ -23,7 +23,7 @@ void free_sway_binding(struct sway_binding *binding) { return; } - free_flat_list(binding->keys); + list_free_items_and_destroy(binding->keys); free(binding->input); free(binding->command); free(binding); @@ -220,14 +220,14 @@ static struct cmd_results *cmd_bindsym_or_bindcode(int argc, char **argv, uint32_t *key = calloc(1, sizeof(uint32_t)); if (!key) { free_sway_binding(binding); - free_flat_list(split); + list_free_items_and_destroy(split); return cmd_results_new(CMD_FAILURE, bindtype, "Unable to allocate binding key"); } *key = key_val; list_add(binding->keys, key); } - free_flat_list(split); + list_free_items_and_destroy(split); binding->order = binding_order++; // refine region of interest for mouse binding once we are certain diff --git a/sway/commands/reload.c b/sway/commands/reload.c index c236911e..3ccbbf34 100644 --- a/sway/commands/reload.c +++ b/sway/commands/reload.c @@ -24,7 +24,7 @@ static void do_reload(void *data) { if (!load_main_config(config->current_config_path, true, false)) { wlr_log(WLR_ERROR, "Error(s) reloading config"); - free_flat_list(bar_ids); + list_free_items_and_destroy(bar_ids); return; } @@ -41,7 +41,7 @@ static void do_reload(void *data) { } } } - free_flat_list(bar_ids); + list_free_items_and_destroy(bar_ids); config_update_font_height(true); root_for_each_container(rebuild_textures_iterator, NULL); diff --git a/sway/commands/workspace.c b/sway/commands/workspace.c index 7d32e65b..211b344d 100644 --- a/sway/commands/workspace.c +++ b/sway/commands/workspace.c @@ -33,7 +33,7 @@ static struct workspace_config *workspace_config_find_or_create(char *ws_name) { void free_workspace_config(struct workspace_config *wsc) { free(wsc->workspace); - free_flat_list(wsc->outputs); + list_free_items_and_destroy(wsc->outputs); free(wsc); } diff --git a/sway/config.c b/sway/config.c index 4621cad9..5b03bc56 100644 --- a/sway/config.c +++ b/sway/config.c @@ -444,7 +444,7 @@ bool load_main_config(const char *file, bool is_active, bool validating) { } } - free_flat_list(secconfigs); + list_free_items_and_destroy(secconfigs); } */ @@ -652,7 +652,7 @@ bool read_config(FILE *file, struct sway_config *config, if (read + length > config_size) { wlr_log(WLR_ERROR, "Config file changed during reading"); - free_flat_list(stack); + list_free_items_and_destroy(stack); free(line); return false; } @@ -681,7 +681,7 @@ bool read_config(FILE *file, struct sway_config *config, } char *expanded = expand_line(block, line, brace_detected > 0); if (!expanded) { - free_flat_list(stack); + list_free_items_and_destroy(stack); free(line); return false; } @@ -746,7 +746,7 @@ bool read_config(FILE *file, struct sway_config *config, free(line); free_cmd_results(res); } - free_flat_list(stack); + list_free_items_and_destroy(stack); config->current_config_line_number = 0; config->current_config_line = NULL; diff --git a/sway/config/bar.c b/sway/config/bar.c index fc773026..45c9e998 100644 --- a/sway/config/bar.c +++ b/sway/config/bar.c @@ -52,7 +52,7 @@ void free_bar_config(struct bar_config *bar) { free_bar_binding(bar->bindings->items[i]); } list_free(bar->bindings); - free_flat_list(bar->outputs); + list_free_items_and_destroy(bar->outputs); if (bar->pid != 0) { terminate_swaybar(bar->pid); } diff --git a/sway/tree/container.c b/sway/tree/container.c index ac433577..b106e0d9 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -68,7 +68,7 @@ void container_destroy(struct sway_container *con) { list_free(con->current.children); list_free(con->outputs); - free_flat_list(con->marks); + list_free_items_and_destroy(con->marks); wlr_texture_destroy(con->marks_focused); wlr_texture_destroy(con->marks_focused_inactive); wlr_texture_destroy(con->marks_unfocused); diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c index 4be63311..ed24b4fd 100644 --- a/sway/tree/workspace.c +++ b/sway/tree/workspace.c @@ -142,7 +142,7 @@ void workspace_destroy(struct sway_workspace *workspace) { free(workspace->name); free(workspace->representation); - free_flat_list(workspace->output_priority); + list_free_items_and_destroy(workspace->output_priority); list_free(workspace->floating); list_free(workspace->tiling); list_free(workspace->current.floating);