X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbasic%2Flog.h;h=8353394ffac950e133fab1e3d72caf97b120c23e;hb=d5aacbb6077b4e45fd36fbff6843595aa64d2288;hp=8619301e1ff62ca868d11744029c9d3a67ec1a7d;hpb=e6073bec9b44ce1a3b2c905f0a60ff26766c8747;p=elogind.git

diff --git a/src/basic/log.h b/src/basic/log.h
index 8619301e1..8353394ff 100644
--- a/src/basic/log.h
+++ b/src/basic/log.h
@@ -77,6 +77,18 @@ void log_close_console(void);
 
 void log_parse_environment(void);
 
+int log_dispatch_internal(
+                int level,
+                int error,
+                const char *file,
+                int line,
+                const char *func,
+                const char *object_field,
+                const char *object,
+                const char *extra,
+                const char *extra_field,
+                char *buffer);
+
 int log_internal(
                 int level,
                 int error,
@@ -117,7 +129,7 @@ int log_object_internalv(
                 const char *extra_field,
                 const char *extra,
                 const char *format,
-                va_list ap) _printf_(9,0);
+                va_list ap) _printf_(10,0);
 
 int log_struct_internal(
                 int level,
@@ -139,7 +151,7 @@ int log_format_iovec(
                 bool newline_separator,
                 int error,
                 const char *format,
-                va_list ap);
+                va_list ap) _printf_(6, 0);
 
 /* This modifies the buffer passed! */
 int log_dump_internal(
@@ -169,6 +181,9 @@ void log_assert_failed_return(
                 int line,
                 const char *func);
 
+#define log_dispatch(level, error, buffer)                              \
+        log_dispatch_internal(level, error, __FILE__, __LINE__, __func__, NULL, NULL, NULL, NULL, buffer)
+
 /* Logging with level */
 #define log_full_errno(level, error, ...)                               \
         ({                                                              \
@@ -228,8 +243,8 @@ LogTarget log_target_from_string(const char *s) _pure_;
 void log_received_signal(int level, const struct signalfd_siginfo *si);
 
 void log_set_upgrade_syslog_to_journal(bool b);
-#endif // 0
 void log_set_always_reopen_console(bool b);
+#endif // 0
 
 int log_syntax_internal(
                 const char *unit,