util: netdevbridge: Refactor error handling in virNetDevBridgeCreate

Replace the switch statement with a simpler if statement. This also
removes the fallthrough path that coverity was complaining about.
This commit is contained in:
Peter Krempa 2017-06-28 14:14:53 +02:00
parent c06b623c53
commit d077fbc221

View File

@ -468,22 +468,17 @@ virNetDevBridgeCreate(const char *brname)
if (resp->nlmsg_len < NLMSG_LENGTH(sizeof(*err)))
goto malformed_resp;
switch (err->error) {
case 0:
break;
case -EOPNOTSUPP:
if (err->error < 0) {
# if defined(HAVE_STRUCT_IFREQ) && defined(SIOCBRADDBR)
/* fallback to ioctl if netlink doesn't support creating
* bridges
*/
rc = virNetDevBridgeCreateWithIoctl(brname);
goto cleanup;
if (err->error == -EOPNOTSUPP) {
/* fallback to ioctl if netlink doesn't support creating
* bridges
*/
rc = virNetDevBridgeCreateWithIoctl(brname);
goto cleanup;
}
# endif
/* intentionally fall through if virNetDevBridgeCreateWithIoctl()
* isn't available.
*/
ATTRIBUTE_FALLTHROUGH;
default:
virReportSystemError(-err->error,
_("error creating bridge interface %s"),
brname);