From e16672e1ffcf3e52f1444c362c52183c9f9f201c Mon Sep 17 00:00:00 2001
From: Jorge Arellano Cid <jcid@dillo.org>
Date: Fri, 29 May 2009 16:23:03 -0400
Subject: Refactor of MSG macros

---
 src/msg.h | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/msg.h b/src/msg.h
index 245ee803..c6ddcb48 100644
--- a/src/msg.h
+++ b/src/msg.h
@@ -11,28 +11,17 @@
 #define _MSG_WARN(...)
 #define _MSG_HTTP(...)
 
-
-#define MSG(...)                                   \
+#define MSG_INNARDS(prefix, ...)                   \
    D_STMT_START {                                  \
       if (prefs.show_msg){                         \
-         printf(__VA_ARGS__);                      \
+         printf(prefix __VA_ARGS__);               \
          fflush (stdout);                          \
       }                                            \
    } D_STMT_END
 
-#define MSG_WARN(...)                              \
-   D_STMT_START {                                  \
-      if (prefs.show_msg)                          \
-         printf("** WARNING **: " __VA_ARGS__);    \
-   } D_STMT_END
-
-#define MSG_ERR(...)                               \
-   D_STMT_START {                                  \
-      if (prefs.show_msg)                          \
-         printf("** ERROR **: " __VA_ARGS__);      \
-   } D_STMT_END
-
-#define MSG_HTTP(...)                              \
-   printf("HTTP warning: " __VA_ARGS__)
+#define MSG(...) MSG_INNARDS("", __VA_ARGS__)
+#define MSG_WARN(...) MSG_INNARDS("** WARNING **: ", __VA_ARGS__)
+#define MSG_ERR(...) MSG_INNARDS("** ERROR **: ", __VA_ARGS__)
+#define MSG_HTTP(...) MSG_INNARDS("HTTP warning: ", __VA_ARGS__)
 
 #endif /* __MSG_H__ */
-- 
cgit v1.2.3