openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

security_dac: Introduce virSecurityDACChownItemFree() 

Introduce a function that frees individual items on the chown
list and declare and use g_autoptr() for it.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Michal Privoznik 2021-06-17 11:36:47 +02:00
parent 91b5ced2f7
commit 0782c4dcb3
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/security/security_dac.c
View File

@ -89,6 +89,18 @@ struct _virSecurityDACChownList {
virThreadLocal chownList;
static void
virSecurityDACChownItemFree(virSecurityDACChownItem *item)
{
if (!item)
return;
g_free(item->path);
g_free(item);
}
G_DEFINE_AUTOPTR_CLEANUP_FUNC(virSecurityDACChownItem, virSecurityDACChownItemFree);
static int
virSecurityDACChownListAppend(virSecurityDACChownList *list,
const char *path,
@ -98,15 +110,11 @@ virSecurityDACChownListAppend(virSecurityDACChownList *list,
bool remember,
bool restore)
{
int ret = -1;
char *tmp = NULL;
virSecurityDACChownItem *item = NULL;
g_autoptr(virSecurityDACChownItem) item = NULL;
item = g_new0(virSecurityDACChownItem, 1);
tmp = g_strdup(path);
item->path = g_steal_pointer(&tmp);
item->path = g_strdup(path);
item->src = src;
item->uid = uid;
item->gid = gid;
@ -114,13 +122,9 @@ virSecurityDACChownListAppend(virSecurityDACChownList *list,
item->restore = restore;
if (VIR_APPEND_ELEMENT(list->items, list->nItems, item) < 0)
goto cleanup;
return -1;
ret = 0;
cleanup:
VIR_FREE(tmp);
VIR_FREE(item);
return ret;
return 0;
}
static void
@ -132,10 +136,8 @@ virSecurityDACChownListFree(void *opaque)
if (!list)
return;
for (i = 0; i < list->nItems; i++) {
g_free(list->items[i]->path);
g_free(list->items[i]);
}
for (i = 0; i < list->nItems; i++)
virSecurityDACChownItemFree(list->items[i]);
g_free(list->items);
virObjectUnref(list->manager);
g_free(list);