X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbasic%2Flog.h;h=fe59fb0ad9746157c4eaa4e14cfd2cfa7408e9d7;hb=5382831207810d62db22b6c87f35f73ddfb30b23;hp=cedf881300d88eded8756681f78adfaf6e889d1e;hpb=89e750e26ce052aec7d38306328a0f52c90c5489;p=elogind.git

diff --git a/src/basic/log.h b/src/basic/log.h
index cedf88130..fe59fb0ad 100644
--- a/src/basic/log.h
+++ b/src/basic/log.h
@@ -35,8 +35,11 @@ typedef enum LogTarget{
         LOG_TARGET_CONSOLE,
         LOG_TARGET_CONSOLE_PREFIXED,
         LOG_TARGET_KMSG,
+/// elogind does not support logging to systemd-journald
+#if 0
         LOG_TARGET_JOURNAL,
         LOG_TARGET_JOURNAL_OR_KMSG,
+#endif // 0
         LOG_TARGET_SYSLOG,
         LOG_TARGET_SYSLOG_OR_KMSG,
         LOG_TARGET_AUTO, /* console if stderr is tty, JOURNAL_OR_KMSG otherwise */
@@ -69,7 +72,7 @@ void log_close(void);
 // UNNEEDED void log_forget_fds(void);
 
 void log_close_syslog(void);
-void log_close_journal(void);
+// UNNEEDED void log_close_journal(void);
 void log_close_kmsg(void);
 void log_close_console(void);
 
@@ -233,3 +236,15 @@ int log_syntax_internal(
                         ? log_syntax_internal(unit, _level, config_file, config_line, _e, __FILE__, __LINE__, __func__, __VA_ARGS__) \
                         : -abs(_e);                                     \
         })
+
+#define log_syntax_invalid_utf8(unit, level, config_file, config_line, rvalue) \
+        ({                                                              \
+                int _level = (level);                                   \
+                if (log_get_max_level() >= LOG_PRI(_level)) {           \
+                        _cleanup_free_ char *_p = NULL;                 \
+                        _p = utf8_escape_invalid(rvalue);               \
+                        log_syntax_internal(unit, _level, config_file, config_line, 0, __FILE__, __LINE__, __func__, \
+                                            "String is not UTF-8 clean, ignoring assignment: %s", strna(_p)); \
+                }                                                       \
+                -EINVAL;                                                \
+        })