diff options
| author | Ronny Chevalier <chevalier.ronny@gmail.com> | 2016-08-05 13:35:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-05 13:35:52 +0200 |
| commit | 96533edceb5bb626a674acda2843de72838811cf (patch) | |
| tree | 58d255848f99af24009cea575d4d58ec53d6874d /src/core/load-fragment.c | |
| parent | 1ed1f50f8277df07918e13cba3331a114eaa6fe3 (diff) | |
| parent | 41bf0590cc89438f1d319465190b1c00809c78fe (diff) | |
Merge pull request #3902 from poettering/parse-nice
util-lib: unify parsing of nice level values
Diffstat (limited to 'src/core/load-fragment.c')
| -rw-r--r-- | src/core/load-fragment.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index d5f035b67f..420f368689 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -491,16 +491,17 @@ int config_parse_socket_bind(const char *unit, return 0; } -int config_parse_exec_nice(const char *unit, - const char *filename, - unsigned line, - const char *section, - unsigned section_line, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { +int config_parse_exec_nice( + const char *unit, + const char *filename, + unsigned line, + const char *section, + unsigned section_line, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { ExecContext *c = data; int priority, r; @@ -510,14 +511,13 @@ int config_parse_exec_nice(const char *unit, assert(rvalue); assert(data); - r = safe_atoi(rvalue, &priority); + r = parse_nice(rvalue, &priority); if (r < 0) { - log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse nice priority, ignoring: %s", rvalue); - return 0; - } + if (r == -ERANGE) + log_syntax(unit, LOG_ERR, filename, line, r, "Nice priority out of range, ignoring: %s", rvalue); + else + log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse nice priority, ignoring: %s", rvalue); - if (priority < PRIO_MIN || priority >= PRIO_MAX) { - log_syntax(unit, LOG_ERR, filename, line, 0, "Nice priority out of range, ignoring: %s", rvalue); return 0; } |