remove now unsed fw3_free_list() helper
authorJo-Philipp Wich <jow@openwrt.org>
Thu, 21 Feb 2013 19:00:59 +0000 (20:00 +0100)
committerJo-Philipp Wich <jow@openwrt.org>
Thu, 21 Feb 2013 19:00:59 +0000 (20:00 +0100)
utils.c
utils.h

diff --git a/utils.c b/utils.c
index f01ba731664018d442a5b8d6660210bb03487298..34464ee638c1e04c028a337469cd32b125c3f335 100644 (file)
--- a/utils.c
+++ b/utils.c
@@ -488,10 +488,20 @@ void
 fw3_free_object(void *obj, const void *opts)
 {
        const struct fw3_option *ol;
+       struct list_head *list, *cur, *tmp;
 
        for (ol = opts; ol->name; ol++)
-               if (ol->elem_size)
-                       fw3_free_list((struct list_head *)((char *)obj + ol->offset));
+       {
+               if (!ol->elem_size)
+                       continue;
+
+               list = (struct list_head *)((char *)obj + ol->offset);
+               list_for_each_safe(cur, tmp, list)
+               {
+                       list_del(cur);
+                       free(cur);
+               }
+       }
 
        free(obj);
 }
diff --git a/utils.h b/utils.h
index 43e2a22428d52774d7a130aab7509d629b30e3e8..baba9df62b6556bf136bce340190df7e3f3d2a6d 100644 (file)
--- a/utils.h
+++ b/utils.h
@@ -50,18 +50,6 @@ void info(const char *format, ...);
             p = list_empty(h) ? list_first_entry(h, typeof(*p), list)         \
                            : list_entry(p->list.next, typeof(*p), list))
 
-static inline void
-fw3_free_list(struct list_head *list)
-{
-       struct list_head *cur, *tmp;
-
-       list_for_each_safe(cur, tmp, list)
-       {
-               list_del(cur);
-               free(cur);
-       }
-}
-
 #define fw3_is_family(p, f)                                                \
        (!p || (p)->family == FW3_FAMILY_ANY || (p)->family == f)