diff options
| author | Michal Schmidt <mschmidt@redhat.com> | 2015-07-21 18:35:18 +0200 |
|---|---|---|
| committer | Michal Schmidt <mschmidt@redhat.com> | 2015-07-21 20:07:34 +0200 |
| commit | 3567afa5b4775cf74bc92617cc716b4f4c28a120 (patch) | |
| tree | e844bbf8cc859305c2e8633f1a79fcddf35b05e0 /src | |
| parent | e00f5bddde0daff900cbd93e1ee0530ad1ae06ce (diff) | |
udev: unify reporting of invalid cmdline keys
This way it does not need distinct string literals and it also preserves
the "rd." prefix.
Diffstat (limited to 'src')
| -rw-r--r-- | src/udev/udevd.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/udev/udevd.c b/src/udev/udevd.c index f14efbe203..945845d72c 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -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,28 +1379,28 @@ 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; } static void help(void) { |