diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-03-04 15:50:26 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-03-04 16:04:50 +0100 |
commit | b5d742138f71e87312541a89aac5657015f50f48 (patch) | |
tree | fe311a3e7a1f401a13557684e83f919ba28c8268 /src/shared/conf-parser.h | |
parent | Introduce strv_consume which takes ownership (diff) | |
download | systemd-b5d742138f71e87312541a89aac5657015f50f48.tar.xz systemd-b5d742138f71e87312541a89aac5657015f50f48.zip |
Do not print invalid UTF-8 in error messages
Inexplicably, 550a40ec ('core: do not print invalid utf-8 in error
messages') only fixed two paths. Convert all of them now.
Diffstat (limited to 'src/shared/conf-parser.h')
-rw-r--r-- | src/shared/conf-parser.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h index e1c7ab44c9..ba0e58db25 100644 --- a/src/shared/conf-parser.h +++ b/src/shared/conf-parser.h @@ -121,6 +121,12 @@ int log_syntax_internal(const char *unit, int level, config_file, config_line, \ error, __VA_ARGS__) +#define log_invalid_utf8(unit, level, config_file, config_line, error, rvalue) { \ + _cleanup_free_ char *__p = utf8_escape_invalid(rvalue); \ + log_syntax(unit, level, config_file, config_line, error, \ + "String is not UTF-8 clean, ignoring assignment: %s", __p); \ + } + #define DEFINE_CONFIG_PARSE_ENUM(function,name,type,msg) \ int function(const char *unit, \ const char *filename, \ |