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

util: hook: 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-24 21:22:18 +05:30 committed by Erik Skultety
parent 5d7bf2f852
commit fa0134cd3a
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/util/virhook.c
View File

@ -122,8 +122,7 @@ static int virHooksFound = -1;
static int
virHookCheck(int no, const char *driver)
{
char *path;
int ret;
VIR_AUTOFREE(char *) path = NULL;
if (driver == NULL) {
virReportError(VIR_ERR_INTERNAL_ERROR,
@ -139,18 +138,17 @@ virHookCheck(int no, const char *driver)
}
if (!virFileExists(path)) {
ret = 0;
VIR_DEBUG("No hook script %s", path);
} else if (!virFileIsExecutable(path)) {
ret = 0;
VIR_WARN("Non-executable hook script %s", path);
} else {
ret = 1;
VIR_DEBUG("Found hook script %s", path);
return 0;
}
VIR_FREE(path);
return ret;
if (!virFileIsExecutable(path)) {
VIR_WARN("Non-executable hook script %s", path);
return 0;
}
VIR_DEBUG("Found hook script %s", path);
return 1;
}
/*
@ -233,7 +231,7 @@ virHookCall(int driver,
char **output)
{
int ret;
char *path;
VIR_AUTOFREE(char *) path = NULL;
virCommandPtr cmd;
const char *drvstr;
const char *opstr;
@ -318,7 +316,5 @@ virHookCall(int driver,
virCommandFree(cmd);
VIR_FREE(path);
return ret;
}