Merge commit 'grg' into HEAD

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

diff --git a/libopkg/void_list.c b/libopkg/void_list.c
index e36b4517688248af5a3f4000364dcecb58b76588..04066bfa021fcdb31335570b289da44f2cc30ece 100644 (file)
--- a/libopkg/void_list.c
+++ b/libopkg/void_list.c
@@ -16,20 +16,17 @@
 */
 
 #include "includes.h"
-#include <errno.h>
 
 #include "void_list.h"
 #include "libbb/libbb.h"
 
-int void_list_elt_init(void_list_elt_t *elt, void *data)
+void void_list_elt_init(void_list_elt_t *elt, void *data)
 {
     INIT_LIST_HEAD(&elt->node);
     elt->data = data;
-
-    return 0;
 }
 
-void_list_elt_t * void_list_elt_new (void *data) {
+static void_list_elt_t * void_list_elt_new (void *data) {
     void_list_elt_t *elt;
     /* freed in void_list_elt_deinit */
     elt = xcalloc(1, sizeof(void_list_elt_t));
@@ -44,10 +41,9 @@ void void_list_elt_deinit(void_list_elt_t *elt)
     free(elt);
 }
 
-int void_list_init(void_list_t *list)
+void void_list_init(void_list_t *list)
 {
     INIT_LIST_HEAD(&list->head);
-    return 0;
 }
 
 void void_list_deinit(void_list_t *list)
@@ -61,22 +57,16 @@ void void_list_deinit(void_list_t *list)
     INIT_LIST_HEAD(&list->head);
 }
 
-int void_list_append(void_list_t *list, void *data)
+void void_list_append(void_list_t *list, void *data)
 {
     void_list_elt_t *elt = void_list_elt_new(data);
-     
     list_add_tail(&elt->node, &list->head);
-
-    return 0;
 }
 
-int void_list_push(void_list_t *list, void *data)
+void void_list_push(void_list_t *list, void *data)
 {
     void_list_elt_t *elt = void_list_elt_new(data);
-
     list_add(&elt->node, &list->head);
-
-    return 0;
 }
 
 void_list_elt_t *void_list_pop(void_list_t *list)
@@ -106,7 +96,7 @@ void *void_list_remove(void_list_t *list, void_list_elt_t **iter)
             break;
     }
     if ( pos != old_elt) {
-        fprintf(stderr, "%s: ERROR: element not found in list\n", __FUNCTION__);
+        opkg_msg(ERROR, "Internal error: element not found in list.\n");
         return NULL;
     }