X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libopkg%2Fstr_list.c;h=58a00a58964a22b7f82c03eaddaa6463d999229e;hb=e2e66a62227b2805c4577b33e36ee4fc7d090e86;hp=563f3a144315c6d9ec6ed3617e2832ef38c7bac3;hpb=483c4d7573439e71d0bdfe5a9192b3ffc06d35c1;p=oweals%2Fopkg-lede.git

diff --git a/libopkg/str_list.c b/libopkg/str_list.c
index 563f3a1..58a00a5 100644
--- a/libopkg/str_list.c
+++ b/libopkg/str_list.c
@@ -15,99 +15,104 @@
    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)
+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);
+	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);
-     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)
 {
-    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_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, 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)
+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);
 }
 
-void 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)
 {
-    str_list_elt_t * elt = 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);
 
-    str_list_elt_deinit(elt);
+	if (str)
+		free(str);
 }
 
-void 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)
 {
-     char *str = 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);
+					 (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_first(str_list_t * list)
+{
+	return (str_list_elt_t *) void_list_first((void_list_t *) list);
 }
 
-str_list_elt_t *str_list_prev(str_list_t *list, str_list_elt_t *node) {
-    return (str_list_elt_t * )void_list_prev((void_list_t *) list, (void_list_elt_t *)node);
+str_list_elt_t *str_list_prev(str_list_t * list, str_list_elt_t * node)
+{
+	return (str_list_elt_t *) void_list_prev((void_list_t *) list,
+						 (void_list_elt_t *) node);
 }
 
-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);
+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);
 }
 
-str_list_elt_t *str_list_last(str_list_t *list) {
-    return (str_list_elt_t * )void_list_last((void_list_t *) list);
+str_list_elt_t *str_list_last(str_list_t * list)
+{
+	return (str_list_elt_t *) void_list_last((void_list_t *) list);
 }
 
-
-void str_list_purge(str_list_t *list) {
-    str_list_deinit(list);
-    free(list);
+void str_list_purge(str_list_t * list)
+{
+	str_list_deinit(list);
+	free(list);
 }