SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util: rename signal_from_string_try_harder() to signal_from_string()

Browse Source 
Also this makes the new `signal_from_string()` function reject
e.g, `SIG3` or `SIG+5`.
This commit is contained in:
Yu Watanabe
2018-05-03 16:52:49 +09:00
parent 08d3fdc37e
commit 29a3db75fd
9 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/bus-unit-util.c
+3 -3
View File
@@ -109,7 +109,7 @@ DEFINE_BUS_APPEND_PARSE("i", log_level_from_string);
DEFINE_BUS_APPEND_PARSE("i", parse_errno);
DEFINE_BUS_APPEND_PARSE("i", sched_policy_from_string);
DEFINE_BUS_APPEND_PARSE("i", secure_bits_from_string);
DEFINE_BUS_APPEND_PARSE("i", signal_from_string_try_harder);
DEFINE_BUS_APPEND_PARSE("i", signal_from_string);
DEFINE_BUS_APPEND_PARSE("i", socket_protocol_from_name);
DEFINE_BUS_APPEND_PARSE_PTR("i", int32_t, int, ioprio_parse_priority);
DEFINE_BUS_APPEND_PARSE_PTR("i", int32_t, int, parse_nice);
@@ -1189,7 +1189,7 @@ static int bus_append_kill_property(sd_bus_message *m, const char *field, const
if (streq(field, "KillSignal"))
return bus_append_signal_from_string_try_harder(m, field, eq);
return bus_append_signal_from_string(m, field, eq);
return 0;
}
@@ -1298,7 +1298,7 @@ static int bus_append_service_property(sd_bus_message *m, const char *field, con
r = safe_atoi(word, &val);
if (r < 0) {
val = signal_from_string_try_harder(word);
val = signal_from_string(word);
if (val < 0)
return log_error_errno(r, "Invalid status or signal %s in %s: %m", word, field);
src/shared/conf-parser.c
+1 -1
View File
@@ -927,7 +927,7 @@ int config_parse_signal(
assert(rvalue);
assert(sig);
r = signal_from_string_try_harder(rvalue);
r = signal_from_string(rvalue);
if (r <= 0) {
log_syntax(unit, LOG_ERR, filename, line, 0, "Failed to parse signal name, ignoring: %s", rvalue);
return 0;