Propagate errors upwards.

[project/opkg-lede.git] / libopkg / opkg_message.c

diff --git a/libopkg/opkg_message.c b/libopkg/opkg_message.c
index 38f16df192a23c57b4c766be31b2c70ca22256cc..33a9c90e3b3eaacbb459955e804fd2afe34dc4ba 100644 (file)
--- a/libopkg/opkg_message.c
+++ b/libopkg/opkg_message.c
@@ -1,4 +1,4 @@
-/* opkg_message.c - the itsy package management system
+/* opkg_message.c - the opkg package management system
 
    Copyright (C) 2003 Daniele Nicolodi <daniele@grinta.net>
 
@@ -14,11 +14,11 @@
 */
 
 
-#include "opkg.h"
+#include "includes.h"
 #include "opkg_conf.h"
 #include "opkg_message.h"
-
-#ifndef OPKG_LIB
+#include "opkg_error.h"
+#include "opkg_utils.h"
 
 void
 opkg_message (opkg_conf_t * conf, message_level_t level, char *fmt, ...)
@@ -26,36 +26,16 @@ opkg_message (opkg_conf_t * conf, message_level_t level, char *fmt, ...)
        va_list ap;
 
        if (conf && (conf->verbosity < level))
-       {
                return;
-       }
-       else
-       {
-
-               va_start (ap, fmt);
-               vprintf (fmt, ap);
-               va_end (ap);
-       }
-}
 
-#else
+       va_start (ap, fmt);
 
-#include "libopkg.h"
+       if (level == OPKG_ERROR) {
+               char msg[256];
+               vsnprintf(msg, 256, fmt, ap);
+               push_error_list(msg);
+       } else
+               vprintf(fmt, ap);
 
-//#define opkg_message(conf, level, fmt, arg...) opkg_cb_message(conf, level, fmt, ## arg)
-
-void
-opkg_message (opkg_conf_t * conf, message_level_t level, char *fmt, ...)
-{
-       va_list ap;
-       char ts[256];
-
-       if (opkg_cb_message)
-       {
-               va_start (ap, fmt);
-               vsnprintf (ts,256,fmt, ap);
-               va_end (ap);
-               opkg_cb_message(conf,level,ts);
-       }
+       va_end (ap);
 }
-#endif