X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=libopkg%2Fpkg_src_list.c;h=036d0c9778d9d27e02e545a4322d24614a73a207;hb=70b9bffc7dbffaf526a665c92d732c110baccaa2;hp=9a2a90f45a8a0d9652b02f1d7f79cb58cf185208;hpb=5f550c85c4d2308a15f49f4d2d975b0614867412;p=oweals%2Fopkg-lede.git

diff --git a/libopkg/pkg_src_list.c b/libopkg/pkg_src_list.c
index 9a2a90f..036d0c9 100644
--- a/libopkg/pkg_src_list.c
+++ b/libopkg/pkg_src_list.c
@@ -15,61 +15,50 @@
    General Public License for more details.
 */
 
-#include "includes.h"
-
 #include "pkg_src_list.h"
 #include "void_list.h"
+#include "libbb/libbb.h"
 
-int pkg_src_list_init(pkg_src_list_t *list)
+void pkg_src_list_init(pkg_src_list_t * list)
 {
-    return void_list_init((void_list_t *) list);
+	void_list_init((void_list_t *) list);
 }
 
-void pkg_src_list_deinit(pkg_src_list_t *list)
+void pkg_src_list_deinit(pkg_src_list_t * list)
 {
-    pkg_src_list_elt_t *iter, *n;
-    pkg_src_t *pkg_src;
-
-    list_for_each_entry_safe(iter, n, &list->head, node) {
-      pkg_src = (pkg_src_t *)iter->data;
-      pkg_src_deinit(pkg_src);
-
-      /* malloced in pkg_src_list_append */
-      free(pkg_src);
-      iter->data = NULL;
-    }
-    void_list_deinit((void_list_t *) list);
+	pkg_src_list_elt_t *iter, *n;
+	pkg_src_t *pkg_src;
+
+	list_for_each_entry_safe(iter, n, &list->head, node) {
+		pkg_src = (pkg_src_t *) iter->data;
+		pkg_src_deinit(pkg_src);
+
+		/* malloced in pkg_src_list_append */
+		free(pkg_src);
+		iter->data = NULL;
+	}
+	void_list_deinit((void_list_t *) list);
 }
 
-pkg_src_t *pkg_src_list_append(pkg_src_list_t *list,
-			       const char *name, const char *base_url, const char *extra_data,
-			       int gzip)
+pkg_src_t *pkg_src_list_append(pkg_src_list_t * list,
+			       const char *name, const char *base_url,
+			       const char *extra_data, int gzip)
 {
-    int err;
-
-    /* freed in pkg_src_list_deinit */
-    pkg_src_t *pkg_src = calloc(1, sizeof(pkg_src_t));
-
-    if (pkg_src == NULL) {
-	fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	return NULL;
-    }
-    pkg_src_init(pkg_src, name, base_url, extra_data, gzip);
+	/* freed in pkg_src_list_deinit */
+	pkg_src_t *pkg_src = xcalloc(1, sizeof(pkg_src_t));
+	pkg_src_init(pkg_src, name, base_url, extra_data, gzip);
 
-    err = void_list_append((void_list_t *) list, pkg_src);
-    if (err) {
-	return NULL;
-    }
+	void_list_append((void_list_t *) list, pkg_src);
 
-    return pkg_src;
+	return pkg_src;
 }
 
-int pkg_src_list_push(pkg_src_list_t *list, pkg_src_t *data)
+void pkg_src_list_push(pkg_src_list_t * list, pkg_src_t * data)
 {
-    return void_list_push((void_list_t *) list, data);
+	void_list_push((void_list_t *) list, data);
 }
 
-pkg_src_list_elt_t *pkg_src_list_pop(pkg_src_list_t *list)
+pkg_src_list_elt_t *pkg_src_list_pop(pkg_src_list_t * list)
 {
-    return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list);
+	return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list);
 }