str_list_prev: remove unused function

[oweals/opkg-lede.git] / libopkg / str_list.c

diff --git a/libopkg/str_list.c b/libopkg/str_list.c
index e79bf8d9d3b7d11d60647eee3fcbd59d0c28274f..d93f13a90a8036ef92562ff40069d779b32c0176 100644 (file)
--- a/libopkg/str_list.c
+++ b/libopkg/str_list.c
@@ -1,4 +1,4 @@
-/* str_list.c - the itsy package management system
+/* str_list.c - the opkg package management system
 
    Carl D. Worth
 
@@ -15,62 +15,93 @@
    General Public License for more details.
 */
 
-#include "opkg.h"
-
 #include "str_list.h"
+#include "libbb/libbb.h"
 
-int str_list_elt_init(str_list_elt_t *elt, char *data)
+void str_list_elt_init(str_list_elt_t * elt, char *data)
 {
-    return void_list_elt_init((void_list_elt_t *) elt, data);
+       void_list_elt_init((void_list_elt_t *) elt, data);
 }
 
-void str_list_elt_deinit(str_list_elt_t *elt)
+void str_list_elt_deinit(str_list_elt_t * elt)
 {
-    void_list_elt_deinit((void_list_elt_t *) elt);
+       if (elt->data)
+               free(elt->data);
+       void_list_elt_deinit((void_list_elt_t *) elt);
 }
 
 str_list_t *str_list_alloc()
 {
-     str_list_t *list = (str_list_t *)malloc(sizeof(str_list_t));
-     if (list)
-         str_list_init(list);
-     return list;
+       str_list_t *list = xcalloc(1, sizeof(str_list_t));
+       str_list_init(list);
+       return list;
 }
 
-int str_list_init(str_list_t *list)
+void str_list_init(str_list_t * list)
 {
-    return void_list_init((void_list_t *) list);
+       void_list_init((void_list_t *) list);
 }
 
-void str_list_deinit(str_list_t *list)
+void str_list_deinit(str_list_t * list)
 {
-    void_list_deinit((void_list_t *) list);
+       str_list_elt_t *elt;
+       while (!void_list_empty(list)) {
+               elt = str_list_first(list);
+               if (!elt)
+                       return;
+               list_del_init(&elt->node);
+               free(elt->data);
+               elt->data = NULL;
+               free(elt);
+       }
 }
 
-int str_list_append(str_list_t *list, char *data)
+void str_list_append(str_list_t * list, char *data)
 {
-    return void_list_append((void_list_t *) list, data);
+       void_list_append((void_list_t *) list, xstrdup(data));
 }
 
-int str_list_push(str_list_t *list, char *data)
+void str_list_push(str_list_t * list, char *data)
 {
-    return void_list_push((void_list_t *) list, data);
+       void_list_push((void_list_t *) list, xstrdup(data));
 }
 
-str_list_elt_t *str_list_pop(str_list_t *list)
+str_list_elt_t *str_list_pop(str_list_t * list)
 {
-    return (str_list_elt_t *) void_list_pop((void_list_t *) list);
+       return (str_list_elt_t *) void_list_pop((void_list_t *) list);
 }
 
-str_list_elt_t *str_list_remove(str_list_t *list, str_list_elt_t **iter)
+void str_list_remove(str_list_t * list, str_list_elt_t ** iter)
 {
-    return (str_list_elt_t *) void_list_remove((void_list_t *) list,
-                                              (void_list_elt_t **) iter);
+       char *str = void_list_remove((void_list_t *) list,
+                                    (void_list_elt_t **) iter);
+
+       if (str)
+               free(str);
 }
 
-char *str_list_remove_elt(str_list_t *list, const char *target_str)
+void str_list_remove_elt(str_list_t * list, const char *target_str)
 {
-     return (char *)void_list_remove_elt((void_list_t *) list,
+       char *str = void_list_remove_elt((void_list_t *) list,
                                         (void *)target_str,
-                                        (void_list_cmp_t)strcmp);
+                                        (void_list_cmp_t) strcmp);
+       if (str)
+               free(str);
+}
+
+str_list_elt_t *str_list_first(str_list_t * list)
+{
+       return (str_list_elt_t *) void_list_first((void_list_t *) list);
+}
+
+str_list_elt_t *str_list_next(str_list_t * list, str_list_elt_t * node)
+{
+       return (str_list_elt_t *) void_list_next((void_list_t *) list,
+                                                (void_list_elt_t *) node);
+}
+
+void str_list_purge(str_list_t * list)
+{
+       str_list_deinit(list);
+       free(list);
 }