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

udev: unify reporting of invalid cmdline keys

Browse Source 
This way it does not need distinct string literals and it also preserves
the "rd." prefix.
This commit is contained in:
Michal Schmidt
2015-07-21 20:07:34 +02:00
parent e00f5bddde
commit 3567afa5b4
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/udev/udevd.c
+11 -10
View File
@@ -1358,6 +1358,7 @@ static int listen_fds(int *rctrl, int *rnetlink) {
* udev.event-timeout=<number of seconds> seconds to wait before terminating an event
*/
static int parse_proc_cmdline_item(const char *key, const char *value) {
const char *full_key = key;
int r;
assert(key);
@@ -1378,27 +1379,27 @@ static int parse_proc_cmdline_item(const char *key, const char *value) {
prio = util_log_priority(value);
if (prio < 0)
log_warning("invalid udev.log-priority ignored: %s", value);
else
log_set_max_level(prio);
goto invalid;
log_set_max_level(prio);
} else if (streq(key, "children-max")) {
r = safe_atou(value, &arg_children_max);
if (r < 0)
log_warning("invalid udev.children-max ignored: %s", value);
goto invalid;
} else if (streq(key, "exec-delay")) {
r = safe_atoi(value, &arg_exec_delay);
if (r < 0)
log_warning("invalid udev.exec-delay ignored: %s", value);
goto invalid;
} else if (streq(key, "event-timeout")) {
r = safe_atou64(value, &arg_event_timeout_usec);
if (r < 0)
log_warning("invalid udev.event-timeout ignored: %s", value);
else {
arg_event_timeout_usec *= USEC_PER_SEC;
arg_event_timeout_warn_usec = (arg_event_timeout_usec / 3) ? : 1;
}
goto invalid;
arg_event_timeout_usec *= USEC_PER_SEC;
arg_event_timeout_warn_usec = (arg_event_timeout_usec / 3) ? : 1;
}
return 0;
invalid:
log_warning("invalid %s ignored: %s", full_key, value);
return 0;
}