X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libopkg%2Fopkg_message.h;h=4110ab955111cd4eb2ebe754e2a851018511ccdc;hb=758527e6e714fa077445a6f9f12b5e0a295d2af8;hp=86f895b5329915396a579d47ef86604329ff5c78;hpb=4b0b7ca249bfa4ecc099c2ca56527eb91776f198;p=oweals%2Fopkg-lede.git

diff --git a/libopkg/opkg_message.h b/libopkg/opkg_message.h
index 86f895b..4110ab9 100644
--- a/libopkg/opkg_message.h
+++ b/libopkg/opkg_message.h
@@ -1,5 +1,6 @@
-/* opkg_message.h - the itsy package management system
+/* opkg_message.h - the opkg package management system
 
+   Copyright (C) 2009 Ubiq Technologies <graham.gower@gmail.com>
    Copyright (C) 2003 Daniele Nicolodi <daniele@grinta.net>
 
    This program is free software; you can redistribute it and/or
@@ -16,17 +17,31 @@
 #ifndef _OPKG_MESSAGE_H_
 #define _OPKG_MESSAGE_H_
 
-#include "opkg.h"
-#include "opkg_conf.h"
+#include <string.h>
+#include <errno.h>
 
 typedef enum {
-     OPKG_ERROR,	/* error conditions */
-     OPKG_NOTICE,	/* normal but significant condition */
-     OPKG_INFO,		/* informational message */
-     OPKG_DEBUG,	/* debug level message */
-     OPKG_DEBUG2,	/* more debug level message */
+	ERROR,			/* error conditions */
+	NOTICE,			/* normal but significant condition */
+	INFO,			/* informational message */
+	DEBUG,			/* debug level message */
+	DEBUG2,			/* more debug level message */
 } message_level_t;
 
-extern void opkg_message(opkg_conf_t *conf, message_level_t level, char *fmt, ...);
+void free_error_list(void);
+void print_error_list(void);
+void opkg_message(message_level_t level, const char *fmt, ...)
+    __attribute__ ((format(printf, 2, 3)));
+
+#define opkg_msg(l, fmt, args...) \
+	do { \
+		if (l == NOTICE) \
+			opkg_message(l, fmt, ##args); \
+		else \
+			opkg_message(l, "%s: "fmt, __FUNCTION__, ##args); \
+	} while (0)
+
+#define opkg_perror(l, fmt, args...) \
+	opkg_msg(l, fmt": %s.\n", ##args, strerror(errno))
 
 #endif /* _OPKG_MESSAGE_H_ */