diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-06-28 14:05:39 +0900 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-07-03 15:18:04 +0200 |
| commit | 1e5f4e8ba2bb37f903c5c46ff64600ac86539b52 (patch) | |
| tree | 72e33b76eca9e8bf55d2021436227c5f84719eca /src/shared/conf-parser.c | |
| parent | 8252eb18b8233931bb7c1f2a8d93f69c06e4aba2 (diff) | |
| download | systemd-1e5f4e8ba2bb37f903c5c46ff64600ac86539b52.tar.gz | |
conf-parser,login: logs description of error in parsing size
Diffstat (limited to 'src/shared/conf-parser.c')
| -rw-r--r-- | src/shared/conf-parser.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c index 2d62fdf05d..b21ecee129 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c @@ -532,8 +532,10 @@ int config_parse_iec_size(const char* unit, assert(data); r = parse_size(rvalue, 1024, &v); - if (r < 0 || (uint64_t) (size_t) v != v) { - log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse size value, ignoring: %s", rvalue); + if (r >= 0 && (uint64_t) (size_t) v != v) + r = -ERANGE; + if (r < 0) { + log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse size value '%s', ignoring: %m", rvalue); return 0; } @@ -563,8 +565,10 @@ int config_parse_si_size( assert(data); r = parse_size(rvalue, 1000, &v); - if (r < 0 || (uint64_t) (size_t) v != v) { - log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse size value, ignoring: %s", rvalue); + if (r >= 0 && (uint64_t) (size_t) v != v) + r = -ERANGE; + if (r < 0) { + log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse size value '%s', ignoring: %m", rvalue); return 0; } |