libopkg: fix merging PKG_CONFFILES in pkg_merge()

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

diff --git a/libopkg/pkg_src_list.c b/libopkg/pkg_src_list.c
index 13bff5fe25d5f79c2902300e7cbc865660b18bd7..036d0c9778d9d27e02e545a4322d24614a73a207 100644 (file)
--- a/libopkg/pkg_src_list.c
+++ b/libopkg/pkg_src_list.c
@@ -15,52 +15,50 @@
    General Public License for more details.
 */
 
-#include "includes.h"
-
 #include "pkg_src_list.h"
 #include "void_list.h"
 #include "libbb/libbb.h"
 
-void pkg_src_list_init(pkg_src_list_t *list)
+void pkg_src_list_init(pkg_src_list_t * list)
 {
-    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;
+       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);
+       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);
+               /* 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)
 {
-    /* 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);
+       /* 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);
 
-    void_list_append((void_list_t *) list, pkg_src);
+       void_list_append((void_list_t *) list, pkg_src);
 
-    return pkg_src;
+       return pkg_src;
 }
 
-void 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)
 {
-    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);
 }