External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: kmod: use VIR_AUTOPTR for aggregate types

Browse Source 
By making use of GNU C's cleanup attribute handled by the
VIR_AUTOPTR macro for declaring aggregate pointer variables,
majority of the calls to *Free functions 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-24 21:22:40 +05:30 committed by Erik Skultety
parent c8682fcede
commit c493af5614
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/util/virkmod.c
View File

@ -28,8 +28,7 @@
static int
doModprobe(const char *opts, const char *module, char **outbuf, char **errbuf)
{
int ret = -1;
virCommandPtr cmd = NULL;
VIR_AUTOPTR(virCommand) cmd = NULL;
cmd = virCommandNew(MODPROBE);
if (opts)
@ -42,32 +41,23 @@ doModprobe(const char *opts, const char *module, char **outbuf, char **errbuf)
virCommandSetErrorBuffer(cmd, errbuf);
if (virCommandRun(cmd, NULL) < 0)
goto cleanup;
return -1;
ret = 0;
cleanup:
virCommandFree(cmd);
return ret;
return 0;
}
static int
doRmmod(const char *module, char **errbuf)
{
int ret = -1;
virCommandPtr cmd = NULL;
VIR_AUTOPTR(virCommand) cmd = NULL;
cmd = virCommandNewArgList(RMMOD, module, NULL);
virCommandSetErrorBuffer(cmd, errbuf);
if (virCommandRun(cmd, NULL) < 0)
goto cleanup;
return -1;
ret = 0;
cleanup:
virCommandFree(cmd);
return ret;
return 0;
}
/**