[1/5] Apply missing fixes from upstream

[elogind.git] / src / basic / log.h

diff --git a/src/basic/log.h b/src/basic/log.h
index 5fb223de5a7a3742ef47e55d0a3180f37160fd3c..fe59fb0ad9746157c4eaa4e14cfd2cfa7408e9d7 100644 (file)
--- a/src/basic/log.h
+++ b/src/basic/log.h
@@ -236,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;                                                \
+        })