aboutsummaryrefslogtreecommitdiffstats
path: root/swaynag
diff options
context:
space:
mode:
authorLibravatar Ian Fan <ianfan0@gmail.com>2018-12-08 23:55:14 +0000
committerLibravatar Ian Fan <ianfan0@gmail.com>2018-12-09 01:15:38 +0000
commitc8776fac4232f9faab0a78ef3e18dc4366496421 (patch)
tree028fbc584d233a7a934feb0b6807c9a988c8e7f1 /swaynag
parentlist.c: Remove list_foreach (diff)
downloadsway-c8776fac4232f9faab0a78ef3e18dc4366496421.tar.gz
sway-c8776fac4232f9faab0a78ef3e18dc4366496421.tar.zst
sway-c8776fac4232f9faab0a78ef3e18dc4366496421.zip
Cleanup list code
Diffstat (limited to 'swaynag')
-rw-r--r--swaynag/swaynag.c5
-rw-r--r--swaynag/types.c6
2 files changed, 4 insertions, 7 deletions
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) {
407 swaynag->run_display = false; 407 swaynag->run_display = false;
408 408
409 free(swaynag->message); 409 free(swaynag->message);
410 while (swaynag->buttons->length) { 410 for (int i = 0; i < swaynag->buttons->length; ++i) {
411 struct swaynag_button *button = swaynag->buttons->items[0]; 411 struct swaynag_button *button = swaynag->buttons->items[i];
412 list_del(swaynag->buttons, 0);
413 free(button->text); 412 free(button->text);
414 free(button->action); 413 free(button->action);
415 free(button); 414 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) {
147} 147}
148 148
149void swaynag_types_free(list_t *types) { 149void swaynag_types_free(list_t *types) {
150 while (types->length) { 150 for (int i = 0; i < types->length; ++i) {
151 struct swaynag_type *type = types->items[0]; 151 swaynag_type_free(types->items[i]);
152 swaynag_type_free(type);
153 list_del(types, 0);
154 } 152 }
155 list_free(types); 153 list_free(types);
156} 154}