diff options
| author | Sven Eden <yamakuzure@gmx.net> | 2017-03-29 10:05:39 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-03-29 10:46:30 +0200 |
| commit | 3cd22db822df747636dcf30ebb8ec5d16bb71880 (patch) | |
| tree | 5805f577516c2304c59daad957f2688d8d65cfb0 /src/basic/log.h | |
| parent | f556f28e9299d8e94acc652d58f4515fb89f6229 (diff) | |
[1/5] Apply missing fixes from upstream
Diffstat (limited to 'src/basic/log.h')
| -rw-r--r-- | src/basic/log.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/basic/log.h b/src/basic/log.h index 5fb223de5..fe59fb0ad 100644 --- 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; \ + }) |