Centralize freeing of action lists

Reduces some code duplication and makes it easier to extend struct action

diff --git a/include/action.h b/include/action.h
index 7e2c667d9094ecf3b37b4b777597397b1bade728..44a16fd287b23a91a40674b79cc2777bb1913a16 100644 (file)
--- a/include/action.h
+++ b/include/action.h
@@ -12,6 +12,7 @@ struct action {
 };
 
 struct action *action_create(const char *action_name);
+void action_list_free(struct wl_list *action_list);
 
 void action(struct view *activator, struct server *server,
        struct wl_list *actions, uint32_t resize_edges);

diff --git a/src/action.c b/src/action.c
index 7335f2baff3d1e19039fc601c149813c41a3831e..88f578c5ba8eada61044f227a680d56b05876a2d 100644 (file)
--- a/src/action.c
+++ b/src/action.c
@@ -2,6 +2,7 @@
 #include <strings.h>
 #include <wlr/util/log.h>
 #include "common/spawn.h"
+#include "common/zfree.h"
 #include "labwc.h"
 #include "menu/menu.h"
 #include "action.h"
@@ -76,6 +77,15 @@ action_create(const char *action_name)
        return action;
 }
 
+void action_list_free(struct wl_list *action_list) {
+       struct action *action, *action_tmp;
+       wl_list_for_each_safe(action, action_tmp, action_list, link) {
+               wl_list_remove(&action->link);
+               zfree(action->arg);
+               zfree(action);
+       }
+}
+
 static void
 show_menu(struct server *server, const char *menu)
 {

diff --git a/src/config/rcxml.c b/src/config/rcxml.c
index a0bd9397aa4c792b99a00f6e3246eb899f46e9f7..bc89b43cba9dd8e66314496b44a3c393fcbb3b6e 100644 (file)
--- a/src/config/rcxml.c
+++ b/src/config/rcxml.c
@@ -676,7 +676,6 @@ no_config:
 void
 rcxml_finish(void)
 {
-       struct action *action, *action_tmp;
 
        zfree(rc.font_name_activewindow);
        zfree(rc.font_name_menuitem);
@@ -686,11 +685,7 @@ rcxml_finish(void)
        struct keybind *k, *k_tmp;
        wl_list_for_each_safe(k, k_tmp, &rc.keybinds, link) {
                wl_list_remove(&k->link);
-               wl_list_for_each_safe(action, action_tmp, &k->actions, link) {
-                       wl_list_remove(&action->link);
-                       zfree(action->arg);
-                       zfree(action);
-               }
+               action_list_free(&k->actions);
                zfree(k->keysyms);
                zfree(k);
        }
@@ -698,11 +693,7 @@ rcxml_finish(void)
        struct mousebind *m, *m_tmp;
        wl_list_for_each_safe(m, m_tmp, &rc.mousebinds, link) {
                wl_list_remove(&m->link);
-               wl_list_for_each_safe(action, action_tmp, &m->actions, link) {
-                       wl_list_remove(&action->link);
-                       zfree(action->arg);
-                       zfree(action);
-               }
+               action_list_free(&m->actions);
                zfree(m);
        }
 

diff --git a/src/menu/menu.c b/src/menu/menu.c
index ef28392df34c48e34dc79e710a44dab8cc8735ae..21ea2a3367504c49a2442dde823970a9a1dc2e21 100644 (file)
--- a/src/menu/menu.c
+++ b/src/menu/menu.c
@@ -330,17 +330,12 @@ void
 menu_finish(void)
 {
        struct menu *menu;
-       struct action *action, *action_tmp;
        for (int i = 0; i < nr_menus; ++i) {
                menu = menus + i;
                struct menuitem *item, *next;
                wl_list_for_each_safe(item, next, &menu->menuitems, link) {
                        wl_list_remove(&item->link);
-                       wl_list_for_each_safe(action, action_tmp, &item->actions, link) {
-                               wl_list_remove(&action->link);
-                               zfree(action->arg);
-                               zfree(action);
-                       }
+                       action_list_free(&item->actions);
                        free(item);
                }
        }