virSecretLoad: Simplify cleanup path

When loading a secret value fails, the control jumps over to the
'cleanup' label where explicit call to virSecretDefFree()
happens. This is unnecessary as the corresponding variable can be
declared with g_autoptr() after which all error paths can just
return NULL instantly.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Michal Privoznik 2023-10-16 10:03:28 +02:00
parent 7cb31974ec
commit 2a88b51edf
1 changed files with 5 additions and 6 deletions

View File

@ -865,25 +865,24 @@ virSecretLoad(virSecretObjList *secrets,
const char *path,
const char *configDir)
{
virSecretDef *def = NULL;
g_autoptr(virSecretDef) def = NULL;
virSecretObj *obj = NULL;
if (!(def = virSecretDefParse(NULL, path, 0)))
goto cleanup;
return NULL;
if (virSecretLoadValidateUUID(def, file) < 0)
goto cleanup;
return NULL;
if (!(obj = virSecretObjListAdd(secrets, &def, configDir, NULL)))
goto cleanup;
return NULL;
if (virSecretLoadValue(obj) < 0) {
virSecretObjListRemove(secrets, obj);
g_clear_pointer(&obj, virObjectUnref);
return NULL;
}
cleanup:
virSecretDefFree(def);
return obj;
}