From 71c1fc9985a4948e47142910f7aaf6a8f035d4bf Mon Sep 17 00:00:00 2001
From: Dusan Durech <dusan.d@Centrum.sk>
Date: Sat, 4 Jul 2009 16:51:15 +0200
Subject: add messages macros for messages

---
 src/base/main.h | 12 +-----------
 src/base/msg.h  | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 11 deletions(-)
 create mode 100644 src/base/msg.h

(limited to 'src')

diff --git a/src/base/main.h b/src/base/main.h
index 12efa80..17c9838 100644
--- a/src/base/main.h
+++ b/src/base/main.h
@@ -19,20 +19,10 @@
 #define _(text)			(text)
 #endif /* NLS */
 
-#ifdef DEBUG
-#define DEBUG_MSG(msg,arg...)	printf(msg, ##arg)
-#else /* DEBUG */
-#define DEBUG_MSG(msg,arg...) 
-#endif /* DEBUG */
+#include "msg.h"
 
 #define UNUSED(var)		if (0 && var) {}
 
-#define FATAL(msg,arg...)				\
-		do{					\
-			fprintf(stderr, msg, ##arg);	\
-			abort(0);			\
-		}while(0)
-
 extern char *getParam(char *s);
 extern char *getParamElse(char *s1, char *s2);
 extern bool_t isParamFlag(char *s);
diff --git a/src/base/msg.h b/src/base/msg.h
new file mode 100644
index 0000000..65e3ff3
--- /dev/null
+++ b/src/base/msg.h
@@ -0,0 +1,24 @@
+#ifndef MSG_H
+#define MSG_H
+
+#ifdef DEBUG
+#define DEBUG_MSG(msg,arg...)	printf(msg, ##arg)
+#else /* DEBUG */
+#define DEBUG_MSG(msg,arg...) 
+#endif /* DEBUG * */
+
+#ifdef DEBUG
+#define debug(msg,arg...)	fprintf(stdout, "%s ", _("[Debug]"));   fprintf(stdout, _(msg) "\n", ##arg)
+#else /* DEBUG */
+#define debug(msg,arg...)
+#endif /* DEBUG */
+
+#define warning(msg,arg...)	fprintf(stderr, "%s ", _("[Warning]")); fprintf(stderr, _(msg) "\n", ##arg)
+#define error(msg,arg...)	fprintf(stderr, "%s ", _("[Error]")));  fprintf(stderr, _(msg) "\n", ##arg)
+#define fatal(msg,arg...)								\
+{											\
+	fprintf(stderr, "%s ", _("[Fatal]")); fprintf(stderr, _(msg) "\n", ##arg);	\
+	abort(0);									\
+}
+
+#endif /* MSG_H */
-- 
cgit v1.2.3