Message ID | c25d7deab6c9933cf5b515ca84858d999f2caf90.1605393324.git.me@pmachata.org (mailing list archive) |
---|---|
State | New, archived |
Delegated to: | David Ahern |
Headers | show |
Series | Convert a number of use-cases to parse_on_off(), print_on_off() | expand |
Context | Check | Description |
---|---|---|
netdev/tree_selection | success | Not a local patch |
diff --git a/ip/iplink_bridge_slave.c b/ip/iplink_bridge_slave.c index 79a1d2f5f5b8..f7f6da0c79b7 100644 --- a/ip/iplink_bridge_slave.c +++ b/ip/iplink_bridge_slave.c @@ -297,15 +297,11 @@ static void bridge_slave_print_opt(struct link_util *lu, FILE *f, static void bridge_slave_parse_on_off(char *arg_name, char *arg_val, struct nlmsghdr *n, int type) { - __u8 val; - - if (strcmp(arg_val, "on") == 0) - val = 1; - else if (strcmp(arg_val, "off") == 0) - val = 0; - else - invarg("should be \"on\" or \"off\"", arg_name); + int ret; + __u8 val = parse_on_off(arg_name, arg_val, &ret); + if (ret) + exit(1); addattr8(n, 1024, type, val); }
Invoke parse_on_off() from bridge_slave_parse_on_off() instead of hand-rolling one. Exit on failure, because the invarg that was ivoked here before would. Signed-off-by: Petr Machata <me@pmachata.org> --- ip/iplink_bridge_slave.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)