diff options
| author | Sven Eden <yamakuzure@gmx.net> | 2017-04-24 08:57:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-24 08:57:58 +0100 |
| commit | d2338db3145922b1dfcb3b458e5bce2568a9347a (patch) | |
| tree | 8839d569ed1223aa4a7daac73482c6a866186a50 /src/login/logind-user.c | |
| parent | 063e8de7341034cb8b16a81a46e6553fe6ce4f49 (diff) | |
| parent | ef642c0d2a067d37e0a4df435cdb31d793c5c75c (diff) | |
Merge pull request #5 from elogind/dev_v227
Candidate for next Version v227
Diffstat (limited to 'src/login/logind-user.c')
| -rw-r--r-- | src/login/logind-user.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/login/logind-user.c b/src/login/logind-user.c index 63adc8210..0f7f31aa8 100644 --- a/src/login/logind-user.c +++ b/src/login/logind-user.c @@ -925,26 +925,26 @@ int config_parse_tmpfs_size( errno = 0; ul = strtoul(rvalue, &f, 10); if (errno != 0 || f != e) { - log_syntax(unit, LOG_ERR, filename, line, errno ? errno : EINVAL, "Failed to parse percentage value, ignoring: %s", rvalue); + log_syntax(unit, LOG_ERR, filename, line, errno, "Failed to parse percentage value, ignoring: %s", rvalue); return 0; } if (ul <= 0 || ul >= 100) { - log_syntax(unit, LOG_ERR, filename, line, errno ? errno : EINVAL, "Percentage value out of range, ignoring: %s", rvalue); + log_syntax(unit, LOG_ERR, filename, line, 0, "Percentage value out of range, ignoring: %s", rvalue); return 0; } *sz = PAGE_ALIGN((size_t) ((physical_memory() * (uint64_t) ul) / (uint64_t) 100)); } else { - off_t o; + uint64_t k; - r = parse_size(rvalue, 1024, &o); - if (r < 0 || (off_t) (size_t) o != o) { - log_syntax(unit, LOG_ERR, filename, line, r < 0 ? -r : ERANGE, "Failed to parse size value, ignoring: %s", rvalue); + r = parse_size(rvalue, 1024, &k); + if (r < 0 || (uint64_t) (size_t) k != k) { + log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse size value, ignoring: %s", rvalue); return 0; } - *sz = PAGE_ALIGN((size_t) o); + *sz = PAGE_ALIGN((size_t) k); } return 0; |