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

libvirt_nss: Drop some needless cleanup labels

Browse Source 
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Michal Privoznik 2019-07-10 10:09:46 +02:00
parent d8766dfc22
commit a532bf641b
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tools/nss/libvirt_nss.c
View File

@ -85,7 +85,6 @@ appendAddr(leaseAddress **tmpAddress,
virJSONValuePtr lease, virJSONValuePtr lease,
int af) int af)
{ {
int ret = -1;
const char *ipAddr; const char *ipAddr;
virSocketAddr sa; virSocketAddr sa;
int family; int family;
@ -93,21 +92,20 @@ appendAddr(leaseAddress **tmpAddress,
if (!(ipAddr = virJSONValueObjectGetString(lease, "ip-address"))) { if (!(ipAddr = virJSONValueObjectGetString(lease, "ip-address"))) {
ERROR("ip-address field missing for %s", name); ERROR("ip-address field missing for %s", name);
goto cleanup; return -1;
} }
DEBUG("IP address: %s", ipAddr); DEBUG("IP address: %s", ipAddr);
if (virSocketAddrParse(&sa, ipAddr, AF_UNSPEC) < 0) { if (virSocketAddrParse(&sa, ipAddr, AF_UNSPEC) < 0) {
ERROR("Unable to parse %s", ipAddr); ERROR("Unable to parse %s", ipAddr);
goto cleanup; return -1;
} }
family = VIR_SOCKET_ADDR_FAMILY(&sa); family = VIR_SOCKET_ADDR_FAMILY(&sa);
if (af != AF_UNSPEC && af != family) { if (af != AF_UNSPEC && af != family) {
DEBUG("Skipping address which family is %d, %d requested", family, af); DEBUG("Skipping address which family is %d, %d requested", family, af);
ret = 0; return 0;
goto cleanup;
} }
for (i = 0; i < *ntmpAddress; i++) { for (i = 0; i < *ntmpAddress; i++) {
@ -117,14 +115,13 @@ appendAddr(leaseAddress **tmpAddress,
(void *) &sa.data.inet6.sin6_addr.s6_addr), (void *) &sa.data.inet6.sin6_addr.s6_addr),
FAMILY_ADDRESS_SIZE(family)) == 0) { FAMILY_ADDRESS_SIZE(family)) == 0) {
DEBUG("IP address already in the list"); DEBUG("IP address already in the list");
ret = 0; return 0;
goto cleanup;
} }
} }
if (VIR_REALLOC_N_QUIET(*tmpAddress, *ntmpAddress + 1) < 0) { if (VIR_REALLOC_N_QUIET(*tmpAddress, *ntmpAddress + 1) < 0) {
ERROR("Out of memory"); ERROR("Out of memory");
goto cleanup; return -1;
} }
(*tmpAddress)[*ntmpAddress].af = family; (*tmpAddress)[*ntmpAddress].af = family;
@ -134,9 +131,7 @@ appendAddr(leaseAddress **tmpAddress,
(void *) &sa.data.inet6.sin6_addr.s6_addr), (void *) &sa.data.inet6.sin6_addr.s6_addr),
FAMILY_ADDRESS_SIZE(family)); FAMILY_ADDRESS_SIZE(family));
(*ntmpAddress)++; (*ntmpAddress)++;
ret = 0; return 0;
cleanup:
return ret;
} }
@ -153,11 +148,10 @@ findLeaseInJSON(leaseAddress **tmpAddress,
size_t i; size_t i;
long long expirytime; long long expirytime;
time_t currtime; time_t currtime;
int ret = -1;
if ((currtime = time(NULL)) == (time_t) - 1) { if ((currtime = time(NULL)) == (time_t) - 1) {
ERROR("Failed to get current system time"); ERROR("Failed to get current system time");
goto cleanup; return -1;
} }
for (i = 0; i < nleases; i++) { for (i = 0; i < nleases; i++) {
@ -166,7 +160,7 @@ findLeaseInJSON(leaseAddress **tmpAddress,
if (!lease) { if (!lease) {
/* This should never happen (TM) */ /* This should never happen (TM) */
ERROR("Unable to get element %zu of %zu", i, nleases); ERROR("Unable to get element %zu of %zu", i, nleases);
goto cleanup; return -1;
} }
if (macs) { if (macs) {
@ -190,7 +184,7 @@ findLeaseInJSON(leaseAddress **tmpAddress,
if (virJSONValueObjectGetNumberLong(lease, "expiry-time", &expirytime) < 0) { if (virJSONValueObjectGetNumberLong(lease, "expiry-time", &expirytime) < 0) {
/* A lease cannot be present without expiry-time */ /* A lease cannot be present without expiry-time */
ERROR("expiry-time field missing for %s", name); ERROR("expiry-time field missing for %s", name);
goto cleanup; return -1;
} }
/* Do not report expired lease */ /* Do not report expired lease */
@ -203,12 +197,10 @@ findLeaseInJSON(leaseAddress **tmpAddress,
*found = true; *found = true;
if (appendAddr(tmpAddress, ntmpAddress, lease, af) < 0) if (appendAddr(tmpAddress, ntmpAddress, lease, af) < 0)
goto cleanup; return -1;
} }
ret = 0; return 0;
cleanup:
return ret;
} }