X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flog.h;h=1d9a100eef578b8008e01f68d735c106af12c87c;hp=6df1d59961f66cfd98f461a57e11e6ef8c69b8e8;hb=2c7108c40abfb1f175391aa59cf1b07ab203e690;hpb=e99e38bbdcca3fe5956823bdb3d38544ccf93221 diff --git a/src/log.h b/src/log.h index 6df1d5996..1d9a100ee 100644 --- a/src/log.h +++ b/src/log.h @@ -33,6 +33,7 @@ typedef enum LogTarget{ LOG_TARGET_KMSG, LOG_TARGET_SYSLOG, LOG_TARGET_SYSLOG_OR_KMSG, + LOG_TARGET_NULL, _LOG_TARGET_MAX, _LOG_TARGET_INVALID = -1 } LogTarget; @@ -59,13 +60,21 @@ int log_meta( const char*file, int line, const char *func, - const char *format, ...) _printf_attr(5,6); + const char *format, ...) _printf_attr_(5,6); -_noreturn void log_assert( +_noreturn_ void log_assert( const char*file, int line, const char *func, - const char *format, ...) _printf_attr(4,5); + const char *format, ...) _printf_attr_(4,5); + +/* This modifies the buffer passed! */ +int log_dump_internal( + int level, + const char*file, + int line, + const char *func, + char *buffer); #define log_debug(...) log_meta(LOG_DEBUG, __FILE__, __LINE__, __func__, __VA_ARGS__) #define log_info(...) log_meta(LOG_INFO, __FILE__, __LINE__, __func__, __VA_ARGS__) @@ -73,6 +82,9 @@ _noreturn void log_assert( #define log_warning(...) log_meta(LOG_WARNING, __FILE__, __LINE__, __func__, __VA_ARGS__) #define log_error(...) log_meta(LOG_ERR, __FILE__, __LINE__, __func__, __VA_ARGS__) +/* This modifies the buffer passed! */ +#define log_dump(level, buffer) log_dump_internal(level, __FILE__, __LINE__, __func__, buffer) + const char *log_target_to_string(LogTarget target); LogTarget log_target_from_string(const char *s);