External/libvirt
1
0
Fork 0
Code

util: netdevopenvswitch: use VIR_AUTOFREE instead of VIR_FREE for scalar types

Browse Source 
By making use of GNU C's cleanup attribute handled by the
VIR_AUTOFREE macro for declaring scalar variables, majority
of the VIR_FREE calls can be dropped, which in turn leads to
getting rid of most of our cleanup sections.

Signed-off-by: Sukrit Bhatnagar <skrtbhtngr@gmail.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Sukrit Bhatnagar 2018-07-28 23:31:32 +05:30 committed by Erik Skultety
parent bad48ac042
commit 2d9be4d8b4
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/util/virnetdevopenvswitch.c
View File

@ -149,10 +149,10 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname,
char macaddrstr[VIR_MAC_STRING_BUFLEN]; char macaddrstr[VIR_MAC_STRING_BUFLEN];
char ifuuidstr[VIR_UUID_STRING_BUFLEN]; char ifuuidstr[VIR_UUID_STRING_BUFLEN];
char vmuuidstr[VIR_UUID_STRING_BUFLEN]; char vmuuidstr[VIR_UUID_STRING_BUFLEN];
char *attachedmac_ex_id = NULL; VIR_AUTOFREE(char *) attachedmac_ex_id = NULL;
char *ifaceid_ex_id = NULL; VIR_AUTOFREE(char *) ifaceid_ex_id = NULL;
char *profile_ex_id = NULL; VIR_AUTOFREE(char *) profile_ex_id = NULL;
char *vmid_ex_id = NULL; VIR_AUTOFREE(char *) vmid_ex_id = NULL;
virMacAddrFormat(macaddr, macaddrstr); virMacAddrFormat(macaddr, macaddrstr);
virUUIDFormat(ovsport->interfaceID, ifuuidstr); virUUIDFormat(ovsport->interfaceID, ifuuidstr);
@ -209,10 +209,6 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname,
ret = 0; ret = 0;
cleanup: cleanup:
VIR_FREE(attachedmac_ex_id);
VIR_FREE(ifaceid_ex_id);
VIR_FREE(vmid_ex_id);
VIR_FREE(profile_ex_id);
virCommandFree(cmd); virCommandFree(cmd);
return ret; return ret;
} }
@ -339,10 +335,10 @@ virNetDevOpenvswitchInterfaceStats(const char *ifname,
virDomainInterfaceStatsPtr stats) virDomainInterfaceStatsPtr stats)
{ {
virCommandPtr cmd = NULL; virCommandPtr cmd = NULL;
char *output;
char *tmp; char *tmp;
bool gotStats = false; bool gotStats = false;
int ret = -1; int ret = -1;
VIR_AUTOFREE(char *) output = NULL;
/* Just ensure the interface exists in ovs */ /* Just ensure the interface exists in ovs */
cmd = virCommandNew(OVSVSCTL); cmd = virCommandNew(OVSVSCTL);
@ -399,7 +395,6 @@ virNetDevOpenvswitchInterfaceStats(const char *ifname,
ret = 0; ret = 0;
cleanup: cleanup:
VIR_FREE(output);
virCommandFree(cmd); virCommandFree(cmd);
return ret; return ret;
} }
@ -478,7 +473,7 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path,
size_t ntokens = 0; size_t ntokens = 0;
int status; int status;
int ret = -1; int ret = -1;
char *ovs_timeout = NULL; VIR_AUTOFREE(char *) ovs_timeout = NULL;
/* Openvswitch vhostuser path are hardcoded to /* Openvswitch vhostuser path are hardcoded to
* /<runstatedir>/openvswitch/<ifname> * /<runstatedir>/openvswitch/<ifname>
@ -510,7 +505,6 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path,
cleanup: cleanup:
virStringListFreeCount(tokens, ntokens); virStringListFreeCount(tokens, ntokens);
virCommandFree(cmd); virCommandFree(cmd);
VIR_FREE(ovs_timeout);
return ret; return ret;
} }