[PATCH] fixup logging.h to handle different logging options properly.
Thanks to Olaf Hering <olh@suse.de> for the error message.
This commit is contained in:
parent
be9b51f663
commit
f10fec8197
16
logging.h
16
logging.h
|
@ -24,35 +24,37 @@
|
||||||
#ifndef LOGGING_H
|
#ifndef LOGGING_H
|
||||||
#define 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
|
#ifdef LOG
|
||||||
#include <syslog.h>
|
#include <syslog.h>
|
||||||
|
|
||||||
|
#undef info
|
||||||
#define info(format, arg...) \
|
#define info(format, arg...) \
|
||||||
do { \
|
do { \
|
||||||
log_message (LOG_INFO , format , ## arg); \
|
log_message (LOG_INFO , format , ## arg); \
|
||||||
} while (0)
|
} while (0)
|
||||||
#else
|
|
||||||
#define info(format, arg...) do { } while (0)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
|
#undef dbg
|
||||||
#define dbg(format, arg...) \
|
#define dbg(format, arg...) \
|
||||||
do { \
|
do { \
|
||||||
log_message (LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg); \
|
log_message (LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg); \
|
||||||
} while (0)
|
} while (0)
|
||||||
#else
|
|
||||||
#define dbg(format, arg...) do { } while (0)
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Parser needs it's own debugging statement, we usually don't care about this at all */
|
/* Parser needs it's own debugging statement, we usually don't care about this at all */
|
||||||
#ifdef DEBUG_PARSER
|
#ifdef DEBUG_PARSER
|
||||||
|
#undef dbg_parse
|
||||||
#define dbg_parse(format, arg...) \
|
#define dbg_parse(format, arg...) \
|
||||||
do { \
|
do { \
|
||||||
log_message (LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg); \
|
log_message (LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg); \
|
||||||
} while (0)
|
} while (0)
|
||||||
#else
|
|
||||||
#define dbg_parse(format, arg...) do { } while (0)
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif /* LOG */
|
||||||
|
|
||||||
extern int log_message (int level, const char *format, ...)
|
extern int log_message (int level, const char *format, ...)
|
||||||
__attribute__ ((format (printf, 2, 3)));
|
__attribute__ ((format (printf, 2, 3)));
|
||||||
|
|
Loading…
Reference in a new issue