Stop using opkg_cb_message.

git-svn-id: http://opkg.googlecode.com/svn/trunk@243 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358

diff --git a/libopkg/opkg_message.c b/libopkg/opkg_message.c
index 98b3c9df2545dc8c82c10a7547c85249caf677ee..fc4a19620f8ccc465ecaf554e35d43f8a6ccab9c 100644 (file)
--- a/libopkg/opkg_message.c
+++ b/libopkg/opkg_message.c
@@ -17,27 +17,25 @@
 #include "includes.h"
 #include "opkg_conf.h"
 #include "opkg_message.h"
-
-opkg_message_callback opkg_cb_message = NULL;
+#include "opkg_error.h"
+#include "opkg_utils.h"
 
 void
 opkg_message (opkg_conf_t * conf, message_level_t level, char *fmt, ...)
 {
        va_list ap;
-       char ts[256];
+
+       if (conf && (conf->verbosity < level))
+               return;
 
        va_start (ap, fmt);
-       vsnprintf (ts,256,fmt, ap);
-       va_end (ap);
 
-       if (opkg_cb_message)
-       {
-               opkg_cb_message(conf,level,ts);
-       }
-       else
-       {
-         char *level_s[5] = {"ERROR", "NOTICE", "INFO", "DEBUG", "DEBUG2"};
-         if (level <= conf->verbosity)
-           printf ("opkg-%s: %s", level_s[level], ts);
-       }
+       if (level == OPKG_ERROR) {
+               char msg[256];
+               vsnprintf(msg, 256, fmt, ap);
+               push_error_list(&error_list, msg);
+       } else
+               vprintf(fmt, ap);
+
+       va_end (ap);
 }

diff --git a/libopkg/opkg_message.h b/libopkg/opkg_message.h
index fc6920c3771c021d48873128124a115f4f8654b8..2ca58d8664a1fb2480f7e4113d8796925c416945 100644 (file)
--- a/libopkg/opkg_message.h
+++ b/libopkg/opkg_message.h
@@ -26,9 +26,6 @@ typedef enum {
      OPKG_DEBUG2,      /* more debug level message */
 } message_level_t;
 
-typedef int (*opkg_message_callback)(opkg_conf_t *conf, message_level_t level, 
-       char *msg);
-
 extern void opkg_message(opkg_conf_t *conf, message_level_t level, char *fmt, ...);
 
 #endif /* _OPKG_MESSAGE_H_ */