Browse Source

VS2010 build: Converted applog() macro to function.

nfactor-troky
unknown 11 years ago committed by Noel Maersk
parent
commit
feac311305
  1. 13
      logging.c
  2. 11
      logging.h

13
logging.c

@ -49,6 +49,19 @@ static void my_log_curses(int prio, const char *datetime, const char *str, bool
/* high-level logging function, based on global opt_log_level */ /* high-level logging function, based on global opt_log_level */
void applog(int prio, const char* fmt, ...) {
va_list args;
if (opt_debug || prio != LOG_DEBUG) {
if (use_syslog || opt_log_output || prio <= opt_log_level) {
char tmp42[LOGBUFSIZ];
va_start(args, fmt);
vsnprintf(tmp42, sizeof(tmp42), fmt, args);
va_end(args);
_applog(prio, tmp42, false);
}
}
}
/* /*
* log function * log function
*/ */

11
logging.h

@ -30,20 +30,11 @@ extern int opt_log_show_date;
#define LOGBUFSIZ 256 #define LOGBUFSIZ 256
void applog(int prio, const char* fmt, ...);
extern void _applog(int prio, const char *str, bool force); extern void _applog(int prio, const char *str, bool force);
#define IN_FMT_FFL " in %s %s():%d" #define IN_FMT_FFL " in %s %s():%d"
#define applog(prio, fmt, ...) do { \
if (opt_debug || prio != LOG_DEBUG) { \
if (use_syslog || opt_log_output || prio <= opt_log_level) { \
char tmp42[LOGBUFSIZ]; \
snprintf(tmp42, sizeof(tmp42), fmt, ##__VA_ARGS__); \
_applog(prio, tmp42, false); \
} \
} \
} while (0)
#define applogsiz(prio, _SIZ, fmt, ...) do { \ #define applogsiz(prio, _SIZ, fmt, ...) do { \
if (opt_debug || prio != LOG_DEBUG) { \ if (opt_debug || prio != LOG_DEBUG) { \
if (use_syslog || opt_log_output || prio <= opt_log_level) { \ if (use_syslog || opt_log_output || prio <= opt_log_level) { \

Loading…
Cancel
Save