summaryrefslogtreecommitdiff
path: root/src/basic
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-09-30 20:07:24 +0200
committerLennart Poettering <lennart@poettering.net>2015-09-30 22:26:16 +0200
commit0e05ee044a6e23745bb8906ad91ec7b97c37dbac (patch)
tree01424c7603710d9763451eb1a2303e30c4ed7692 /src/basic
parent12ca818ffddb77eb6a0fabe369a5bcbf6994ff8b (diff)
log: move log_invalid_utf8() to log.h
Also, make sure it follows the same scheme as log_syntax() does in its behaviour.
Diffstat (limited to 'src/basic')
-rw-r--r--src/basic/log.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/basic/log.h b/src/basic/log.h
index 569762d083..369d6b1127 100644
--- a/src/basic/log.h
+++ b/src/basic/log.h
@@ -227,3 +227,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; \
+ })