systemd: merge branch systemd into master

This commit is contained in:
Thomas Haller
2019-04-12 07:22:35 +02:00
10 changed files with 210 additions and 65 deletions

View File

@@ -332,7 +332,7 @@ int log_syntax_invalid_utf8_internal(
({ \
int _level = (level), _e = (error); \
(log_get_max_level() >= LOG_PRI(_level)) \
? log_syntax_internal(unit, _level, config_file, config_line, _e, __FILE__, __LINE__, __func__, __VA_ARGS__) \
? log_internal_realm(_level, _e, __FILE__, __LINE__, __func__, __VA_ARGS__) \
: -ERRNO_VALUE(_e); \
})