opkg: add default message handler

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

diff --git a/libopkg/opkg_message.c b/libopkg/opkg_message.c
index 38f16df192a23c57b4c766be31b2c70ca22256cc..98b3c9df2545dc8c82c10a7547c85249caf677ee 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,35 +14,11 @@
 */
 
 
-#include "opkg.h"
+#include "includes.h"
 #include "opkg_conf.h"
 #include "opkg_message.h"
 
-#ifndef OPKG_LIB
-
-void
-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
-
-#include "libopkg.h"
-
-//#define opkg_message(conf, level, fmt, arg...) opkg_cb_message(conf, level, fmt, ## arg)
+opkg_message_callback opkg_cb_message = NULL;
 
 void
 opkg_message (opkg_conf_t * conf, message_level_t level, char *fmt, ...)
@@ -50,12 +26,18 @@ opkg_message (opkg_conf_t * conf, message_level_t level, char *fmt, ...)
        va_list ap;
        char ts[256];
 
+       va_start (ap, fmt);
+       vsnprintf (ts,256,fmt, ap);
+       va_end (ap);
+
        if (opkg_cb_message)
        {
-               va_start (ap, fmt);
-               vsnprintf (ts,256,fmt, ap);
-               va_end (ap);
                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);
+       }
 }
-#endif