remove now unsed fw3_free_list() helper

diff --git a/utils.c b/utils.c
index f01ba73..34464ee 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;
 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++)
 
        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);
 }
 
        free(obj);
 }

diff --git a/utils.h b/utils.h
index 43e2a22..baba9df 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))
 
             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)
 
 #define fw3_is_family(p, f)                                                \
        (!p || (p)->family == FW3_FAMILY_ANY || (p)->family == f)