matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

devlink: Convert conditional in dl_argv_handle_port() to switch() 

Discovered by Phil's covscan. The final return statement is never reached.
This is not inherently clear from looking at the code, so change the
conditional to a switch() statement which should clarify this.

CC: Phil Sutter <phil@nwl.cc>
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Acked-by: Phil Sutter <phil@nwl.cc>
This commit is contained in:
Hangbin Liu 2016-10-09 10:14:18 +08:00 committed by Stephen Hemminger
parent 9208b4e7c9
commit 7a34b9d098
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
devlink/devlink.c
View File

@ -524,19 +524,18 @@ static int dl_argv_handle_port(struct dl *dl, char **p_bus_name,
return -EINVAL; return -EINVAL;
} }
slash_count = strslashcount(str); slash_count = strslashcount(str);
if (slash_count != 2 && slash_count != 0) { switch (slash_count) {
case 0:
return __dl_argv_handle_port_ifname(dl, str, p_bus_name,
p_dev_name, p_port_index);
case 2:
return __dl_argv_handle_port(str, p_bus_name,
p_dev_name, p_port_index);
default:
pr_err("Wrong port identification string format.\n"); pr_err("Wrong port identification string format.\n");
pr_err("Expected \"bus_name/dev_name/port_index\" or \"netdev_ifname\".\n"); pr_err("Expected \"bus_name/dev_name/port_index\" or \"netdev_ifname\".\n");
return -EINVAL; return -EINVAL;
} }
if (slash_count == 2) {
return __dl_argv_handle_port(str, p_bus_name,
p_dev_name, p_port_index);
} else if (slash_count == 0) {
return __dl_argv_handle_port_ifname(dl, str, p_bus_name,
p_dev_name, p_port_index);
}
return 0;
} }
static int dl_argv_handle_both(struct dl *dl, char **p_bus_name, static int dl_argv_handle_both(struct dl *dl, char **p_bus_name,