Remove stray semicolon.

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

diff --git a/libopkg/str_list.c b/libopkg/str_list.c
index 563f3a144315c6d9ec6ed3617e2832ef38c7bac3..d3a0179411ff5ca26c0ed2f592da99f1bafff014 100644 (file)
--- a/libopkg/str_list.c
+++ b/libopkg/str_list.c
@@ -15,13 +15,12 @@
    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)
@@ -33,15 +32,14 @@ void str_list_elt_deinit(str_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)
@@ -58,14 +56,14 @@ void str_list_deinit(str_list_t *list)
     }
 }
 
-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, strdup(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, strdup(data));
+    void_list_push((void_list_t *) list, xstrdup(data));
 }
 
 str_list_elt_t *str_list_pop(str_list_t *list)
@@ -75,10 +73,11 @@ str_list_elt_t *str_list_pop(str_list_t *list)
 
 void str_list_remove(str_list_t *list, str_list_elt_t **iter)
 {
-    str_list_elt_t * elt = void_list_remove((void_list_t *) list,
+    char *str = void_list_remove((void_list_t *) list,
                                               (void_list_elt_t **) iter);
 
-    str_list_elt_deinit(elt);
+    if (str)
+       free(str);
 }
 
 void str_list_remove_elt(str_list_t *list, const char *target_str)
@@ -86,7 +85,7 @@ void str_list_remove_elt(str_list_t *list, const char *target_str)
      char *str = void_list_remove_elt((void_list_t *) list,
                                         (void *)target_str,
                                         (void_list_cmp_t)strcmp);
-     if (str) 
+     if (str)
          free(str);
 }