Remove stray semicolon.

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

diff --git a/libopkg/str_list.c b/libopkg/str_list.c
index b354c9e3e84eef8d0aacafeca1d32c843f756633..d3a0179411ff5ca26c0ed2f592da99f1bafff014 100644 (file)
--- a/libopkg/str_list.c
+++ b/libopkg/str_list.c
@@ -15,46 +15,55 @@
    General Public License for more details.
 */
 
-#include "includes.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)
 {
+    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 *)calloc(1, sizeof(str_list_t));
-     if (list)
-         str_list_init(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_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)
@@ -62,17 +71,22 @@ str_list_elt_t *str_list_pop(str_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,
+    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);
+     if (str)
+         free(str);
 }
 
 str_list_elt_t *str_list_first(str_list_t *list) {
@@ -93,14 +107,6 @@ str_list_elt_t *str_list_last(str_list_t *list) {
 
 
 void str_list_purge(str_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);
-    }
+    str_list_deinit(list);
+    free(list);
 }