Initial stab at untangling the #include maze. Probably needs a second pass.

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

diff --git a/libopkg/conffile_list.c b/libopkg/conffile_list.c
index 27d48d52824551400e004f7ff24030e6d0c16959..1db77902e9d27a459df6a9cc4c2bfeef651064ca 100644 (file)
--- a/libopkg/conffile_list.c
+++ b/libopkg/conffile_list.c
@@ -1,4 +1,4 @@
-/* conffile_list.c - the itsy package management system
+/* conffile_list.c - the opkg package management system
 
    Carl D. Worth
 
@@ -15,13 +15,11 @@
    General Public License for more details.
 */
 
-#include "opkg.h"
-
 #include "conffile_list.h"
 
-int conffile_list_init(conffile_list_t *list)
+void conffile_list_init(conffile_list_t *list)
 {
-    return nv_pair_list_init(list);
+    nv_pair_list_init(list);
 }
 
 void conffile_list_deinit(conffile_list_t *list)
@@ -35,13 +33,14 @@ conffile_t *conffile_list_append(conffile_list_t *list, const char *file_name,
     return nv_pair_list_append(list, file_name, md5sum);
 }
 
-int conffile_list_push(conffile_list_t *list, conffile_t *data)
+void conffile_list_push(conffile_list_t *list, conffile_t *data)
 {
-    return nv_pair_list_push(list, data);
+    nv_pair_list_push(list, data);
 }
 
 conffile_list_elt_t *conffile_list_pop(conffile_list_t *list)
 {
-    return nv_pair_list_pop(list);
+    conffile_list_elt_t *pos = nv_pair_list_pop(list);
+    return pos;
 }