Merge branch 'master' of ssh://git.freedesktop.org/git/systemd

[elogind.git] / src / log.h

diff --git a/src/log.h b/src/log.h
index 6df1d59961f66cfd98f461a57e11e6ef8c69b8e8..9d141dcdda773a36fb2a13185581b3734fe2d905 100644 (file)
--- a/src/log.h
+++ b/src/log.h
@@ -59,13 +59,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 +81,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);