External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 12:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

networkGetNetworkAddress: Drop empty 'error' label

Browse Source 
Moreover, there are two points within the function, where we're
missing 'goto cleanup'. Fix this too.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2015-02-25 17:51:37 +01:00
parent 77ea6f7b0b
commit 5c6b8226f3
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/network/bridge_driver.c
View File

@ -4562,7 +4562,7 @@ networkGetNetworkAddress(const char *netname, char **netaddr)
virReportError(VIR_ERR_NO_NETWORK,
_("no network with matching name '%s'"),
netname);
goto error;
goto cleanup;
}
netdef = network->def;
@ -4576,7 +4576,7 @@ networkGetNetworkAddress(const char *netname, char **netaddr)
virReportError(VIR_ERR_INTERNAL_ERROR,
_("network '%s' doesn't have an IPv4 address"),
netdef->name);
break;
goto cleanup;
}
addrptr = &ipdef->address;
break;
@ -4598,19 +4598,20 @@ networkGetNetworkAddress(const char *netname, char **netaddr)
virReportError(VIR_ERR_INTERNAL_ERROR,
_("network '%s' has no associated interface or bridge"),
netdef->name);
goto cleanup;
}
break;
}
if (dev_name) {
if (virNetDevGetIPv4Address(dev_name, &addr) < 0)
goto error;
goto cleanup;
addrptr = &addr;
}
if (!(addrptr &&
(*netaddr = virSocketAddrFormat(addrptr)))) {
goto error;
goto cleanup;
}
ret = 0;
@ -4618,9 +4619,6 @@ networkGetNetworkAddress(const char *netname, char **netaddr)
if (network)
virNetworkObjUnlock(network);
return ret;
error:
goto cleanup;
}
/**