X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Flog.h;h=b323b2f7d42bc8b011afae24073b8d3f9709e9ac;hp=2b6971f248e79209e4c9d072c451c5b7d06bf0d1;hb=1cfa9a4cbb41ef770614fa97961cc056a63c1b7c;hpb=b4d23205f238e06aaa31264628e20669e714acad diff --git a/src/shared/log.h b/src/shared/log.h index 2b6971f24..b323b2f7d 100644 --- a/src/shared/log.h +++ b/src/shared/log.h @@ -34,6 +34,7 @@ typedef enum LogTarget{ LOG_TARGET_CONSOLE, + LOG_TARGET_CONSOLE_PREFIXED, LOG_TARGET_KMSG, LOG_TARGET_JOURNAL, LOG_TARGET_JOURNAL_OR_KMSG, @@ -155,12 +156,12 @@ void log_assert_failed_return( const char *func); /* Logging with level */ -#define log_full_errno(level, error, ...) \ - ({ \ - int _l = (level), _e = (error); \ - (log_get_max_level() >= _l) \ - ? log_internal(_l, _e, __FILE__, __LINE__, __func__, __VA_ARGS__) \ - : -abs(_e); \ +#define log_full_errno(level, error, ...) \ + ({ \ + int _level = (level), _e = (error); \ + (log_get_max_level() >= LOG_PRI(_level)) \ + ? log_internal(_level, _e, __FILE__, __LINE__, __func__, __VA_ARGS__) \ + : -abs(_e); \ }) #define log_full(level, ...) log_full_errno(level, 0, __VA_ARGS__)