summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgreg@kroah.com <greg@kroah.com>2004-01-19 20:41:14 -0800
committerGreg KH <gregkh@suse.de>2005-04-26 21:13:17 -0700
commitf10fec8197d9cc794f7f87cf9b14daaf414974d4 (patch)
tree16021c4d814cc0f3ae7f8d316b2063e68e9873dd
parentbe9b51f6638d66025ebde1ca154ae9180383409c (diff)
[PATCH] fixup logging.h to handle different logging options properly.
Thanks to Olaf Hering <olh@suse.de> for the error message.
-rw-r--r--logging.h16
1 files changed, 9 insertions, 7 deletions
diff --git a/logging.h b/logging.h
index 1f2126839b..2d09b9a088 100644
--- a/logging.h
+++ b/logging.h
@@ -24,35 +24,37 @@
#ifndef LOGGING_H
#define LOGGING_H
+#define info(format, arg...) do { } while (0)
+#define dbg(format, arg...) do { } while (0)
+#define dbg_parse(format, arg...) do { } while (0)
+
#ifdef LOG
#include <syslog.h>
+
+#undef info
#define info(format, arg...) \
do { \
log_message (LOG_INFO , format , ## arg); \
} while (0)
-#else
- #define info(format, arg...) do { } while (0)
-#endif
#ifdef DEBUG
+#undef dbg
#define dbg(format, arg...) \
do { \
log_message (LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg); \
} while (0)
-#else
- #define dbg(format, arg...) do { } while (0)
#endif
/* Parser needs it's own debugging statement, we usually don't care about this at all */
#ifdef DEBUG_PARSER
+#undef dbg_parse
#define dbg_parse(format, arg...) \
do { \
log_message (LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg); \
} while (0)
-#else
- #define dbg_parse(format, arg...) do { } while (0)
#endif
+#endif /* LOG */
extern int log_message (int level, const char *format, ...)
__attribute__ ((format (printf, 2, 3)));