diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-07-03 15:36:50 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-07-03 15:37:46 +0200 |
| commit | 3e2d435b3d2247a60d6def932d28a4856566a7d7 (patch) | |
| tree | 6373008fa09233ebb0d326cea55acc6df8c4dee4 /src/core/load-fragment.c | |
| parent | ab016c45a96bad3fe799ce5d680dbecf3878470b (diff) | |
exit-status: rename ExitStatusSet's "code" field to "status"
We should follow the naming scheme waitid() uses, not come up with our
own reversed one...
Diffstat (limited to 'src/core/load-fragment.c')
| -rw-r--r-- | src/core/load-fragment.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index 0f5e71b8d3..b6894d22ae 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -2935,13 +2935,9 @@ int config_parse_set_status( assert(rvalue); assert(data); + /* Empty assignment resets the list */ if (isempty(rvalue)) { - /* Empty assignment resets the list */ - - set_free(status_set->signal); - set_free(status_set->code); - - status_set->signal = status_set->code = NULL; + exit_status_set_free(status_set); return 0; } @@ -2958,7 +2954,7 @@ int config_parse_set_status( val = signal_from_string_try_harder(temp); if (val > 0) { - r = set_ensure_allocated(&status_set->signal, trivial_hash_func, trivial_compare_func); + r = set_ensure_allocated(&status_set->signal, NULL, NULL); if (r < 0) return log_oom(); @@ -2975,11 +2971,11 @@ int config_parse_set_status( if (val < 0 || val > 255) log_syntax(unit, LOG_ERR, filename, line, ERANGE, "Value %d is outside range 0-255, ignoring", val); else { - r = set_ensure_allocated(&status_set->code, trivial_hash_func, trivial_compare_func); + r = set_ensure_allocated(&status_set->status, NULL, NULL); if (r < 0) return log_oom(); - r = set_put(status_set->code, INT_TO_PTR(val)); + r = set_put(status_set->status, INT_TO_PTR(val)); if (r < 0) { log_syntax(unit, LOG_ERR, filename, line, -r, "Unable to store: %s", w); return r; |