diff --git a/daemon/log.h b/daemon/log.h index e617b326d..881cb3e8c 100644 --- a/daemon/log.h +++ b/daemon/log.h @@ -42,7 +42,6 @@ void cdrlog(const char* cdrbuffer); void rtcplog(const char* cdrbuffer); -#define ilog(...) __ilog(__VA_ARGS__) void __ilog(int prio, const char *fmt, ...) __attribute__ ((format (printf, 2, 3))); diff --git a/lib/loglib.c b/lib/loglib.c index ff99e30ed..4b4dddf3c 100644 --- a/lib/loglib.c +++ b/lib/loglib.c @@ -181,7 +181,7 @@ void __vpilog(int prio, const char *prefix, const char *fmt, va_list ap) { piece = msg; while (max_log_line_length && ret > max_log_line_length) { - write_log(xprio, "%s%s%.*s ...", prefix, infix, max_log_line_length, piece); + write_log(xprio, "%s: %s%s%.*s ...", prio_prefix, prefix, infix, max_log_line_length, piece); ret -= max_log_line_length; piece += max_log_line_length; infix = "... "; diff --git a/lib/loglib.h b/lib/loglib.h index 018e14782..c42e92403 100644 --- a/lib/loglib.h +++ b/lib/loglib.h @@ -36,17 +36,17 @@ void __ilog_np(int prio, const char *format, ...) __attribute__ ((format (printf #ifndef __DEBUG -#define pilog(prio, fmt...) \ +#define ilog(prio, fmt, ...) \ do { \ int loglevel = get_log_level(); \ if (LOG_LEVEL_MASK((prio)) > LOG_LEVEL_MASK(loglevel)) \ break; \ if ((loglevel & LOG_FLAG_RESTORE) && !((prio) & LOG_FLAG_RESTORE)) \ break; \ - __ilog(prio, fmt); \ + __ilog(prio, fmt, ##__VA_ARGS__); \ } while (0) #else -#define pilog(prio, fmt...) __ilog(prio, fmt) +#define ilog(prio, fmt, ...) __ilog(prio, fmt, ##__VA_ARGS__) #endif diff --git a/recording-daemon/log.h b/recording-daemon/log.h index 8ab8eee6f..426ec4ad2 100644 --- a/recording-daemon/log.h +++ b/recording-daemon/log.h @@ -10,7 +10,7 @@ #define die(fmt, ...) do { ilog(LOG_CRIT, "Fatal error: " fmt, ##__VA_ARGS__); exit(-1); } while (0) #define die_errno(msg) die("%s: %s", msg, strerror(errno)) -#define ilog(...) __ilog_np(__VA_ARGS__) +#define __ilog(...) __ilog_np(__VA_ARGS__) #define dbg(fmt, ...) ilog(LOG_DEBUG, fmt, ##__VA_ARGS__) #endif