diff options
author | Ian Fan <ianfan0@gmail.com> | 2018-12-08 22:52:29 +0000 |
---|---|---|
committer | Ian Fan <ianfan0@gmail.com> | 2018-12-09 00:37:50 +0000 |
commit | 19e831ed3da2aba75d56e46c57967bcc60442d57 (patch) | |
tree | edaa5855087f9d6f257c5c6dcd5eda0c4cc55b02 /sway | |
parent | Merge pull request #3260 from RedSoxFan/split-flatten (diff) | |
download | sway-19e831ed3da2aba75d56e46c57967bcc60442d57.tar.gz sway-19e831ed3da2aba75d56e46c57967bcc60442d57.tar.zst sway-19e831ed3da2aba75d56e46c57967bcc60442d57.zip |
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.
Diffstat (limited to 'sway')
-rw-r--r-- | sway/commands/bind.c | 4 | ||||
-rw-r--r-- | sway/commands/reload.c | 7 | ||||
-rw-r--r-- | sway/config.c | 9 | ||||
-rw-r--r-- | sway/config/bar.c | 4 | ||||
-rw-r--r-- | sway/tree/container.c | 8 |
5 files changed, 12 insertions, 20 deletions
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) { | |||
23 | return; | 23 | return; |
24 | } | 24 | } |
25 | 25 | ||
26 | if (binding->keys) { | 26 | free_flat_list(binding->keys); |
27 | free_flat_list(binding->keys); | ||
28 | } | ||
29 | free(binding->input); | 27 | free(binding->input); |
30 | free(binding->command); | 28 | free(binding->command); |
31 | free(binding); | 29 | 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) { | |||
24 | 24 | ||
25 | if (!load_main_config(config->current_config_path, true, false)) { | 25 | if (!load_main_config(config->current_config_path, true, false)) { |
26 | wlr_log(WLR_ERROR, "Error(s) reloading config"); | 26 | wlr_log(WLR_ERROR, "Error(s) reloading config"); |
27 | list_foreach(bar_ids, free); | 27 | free_flat_list(bar_ids); |
28 | list_free(bar_ids); | ||
29 | return; | 28 | return; |
30 | } | 29 | } |
31 | 30 | ||
@@ -42,9 +41,7 @@ static void do_reload(void *data) { | |||
42 | } | 41 | } |
43 | } | 42 | } |
44 | } | 43 | } |
45 | 44 | free_flat_list(bar_ids); | |
46 | list_foreach(bar_ids, free); | ||
47 | list_free(bar_ids); | ||
48 | 45 | ||
49 | config_update_font_height(true); | 46 | config_update_font_height(true); |
50 | root_for_each_container(rebuild_textures_iterator, NULL); | 47 | 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, | |||
654 | 654 | ||
655 | if (read + length > config_size) { | 655 | if (read + length > config_size) { |
656 | wlr_log(WLR_ERROR, "Config file changed during reading"); | 656 | wlr_log(WLR_ERROR, "Config file changed during reading"); |
657 | list_foreach(stack, free); | 657 | free_flat_list(stack); |
658 | list_free(stack); | ||
659 | free(line); | 658 | free(line); |
660 | return false; | 659 | return false; |
661 | } | 660 | } |
@@ -684,8 +683,7 @@ bool read_config(FILE *file, struct sway_config *config, | |||
684 | } | 683 | } |
685 | char *expanded = expand_line(block, line, brace_detected > 0); | 684 | char *expanded = expand_line(block, line, brace_detected > 0); |
686 | if (!expanded) { | 685 | if (!expanded) { |
687 | list_foreach(stack, free); | 686 | free_flat_list(stack); |
688 | list_free(stack); | ||
689 | free(line); | 687 | free(line); |
690 | return false; | 688 | return false; |
691 | } | 689 | } |
@@ -750,8 +748,7 @@ bool read_config(FILE *file, struct sway_config *config, | |||
750 | free(line); | 748 | free(line); |
751 | free_cmd_results(res); | 749 | free_cmd_results(res); |
752 | } | 750 | } |
753 | list_foreach(stack, free); | 751 | free_flat_list(stack); |
754 | list_free(stack); | ||
755 | config->current_config_line_number = 0; | 752 | config->current_config_line_number = 0; |
756 | config->current_config_line = NULL; | 753 | config->current_config_line = NULL; |
757 | 754 | ||
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) { | |||
53 | free_bar_binding(binding); | 53 | free_bar_binding(binding); |
54 | } | 54 | } |
55 | list_free(bar->bindings); | 55 | list_free(bar->bindings); |
56 | if (bar->outputs) { | 56 | free_flat_list(bar->outputs); |
57 | free_flat_list(bar->outputs); | ||
58 | } | ||
59 | if (bar->pid != 0) { | 57 | if (bar->pid != 0) { |
60 | terminate_swaybar(bar->pid); | 58 | terminate_swaybar(bar->pid); |
61 | } | 59 | } |
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 @@ | |||
21 | #include "sway/tree/arrange.h" | 21 | #include "sway/tree/arrange.h" |
22 | #include "sway/tree/view.h" | 22 | #include "sway/tree/view.h" |
23 | #include "sway/tree/workspace.h" | 23 | #include "sway/tree/workspace.h" |
24 | #include "list.h" | ||
24 | #include "log.h" | 25 | #include "log.h" |
25 | #include "stringop.h" | 26 | #include "stringop.h" |
26 | 27 | ||
@@ -67,8 +68,7 @@ void container_destroy(struct sway_container *con) { | |||
67 | list_free(con->current.children); | 68 | list_free(con->current.children); |
68 | list_free(con->outputs); | 69 | list_free(con->outputs); |
69 | 70 | ||
70 | list_foreach(con->marks, free); | 71 | free_flat_list(con->marks); |
71 | list_free(con->marks); | ||
72 | wlr_texture_destroy(con->marks_focused); | 72 | wlr_texture_destroy(con->marks_focused); |
73 | wlr_texture_destroy(con->marks_focused_inactive); | 73 | wlr_texture_destroy(con->marks_focused_inactive); |
74 | wlr_texture_destroy(con->marks_unfocused); | 74 | wlr_texture_destroy(con->marks_unfocused); |
@@ -1267,7 +1267,9 @@ bool container_find_and_unmark(char *mark) { | |||
1267 | } | 1267 | } |
1268 | 1268 | ||
1269 | void container_clear_marks(struct sway_container *con) { | 1269 | void container_clear_marks(struct sway_container *con) { |
1270 | list_foreach(con->marks, free); | 1270 | for (int i = 0; i < con->marks->length; ++i) { |
1271 | free(con->marks->items[i]); | ||
1272 | } | ||
1271 | con->marks->length = 0; | 1273 | con->marks->length = 0; |
1272 | ipc_event_window(con, "mark"); | 1274 | ipc_event_window(con, "mark"); |
1273 | } | 1275 | } |