External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-09-08 16:54:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: Rework virStorageAuthDefCopy

Browse Source 
Rather than having an error path, let's rework the code to allocate
and fill into an @authdef variable and then steal that into @ret when
we are successful leaving just a cleanup: path.

Signed-off-by: John Ferlan <jferlan@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
John Ferlan 2019-02-07 17:21:31 -05:00
parent a98d9daf07
commit 6fcc344082
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/util/virstoragefile.c
View File

@ -1879,26 +1879,26 @@ virStorageAuthDefFree(virStorageAuthDefPtr authdef)
virStorageAuthDefPtr
virStorageAuthDefCopy(const virStorageAuthDef *src)
{
virStorageAuthDefPtr ret;
virStorageAuthDefPtr authdef;
virStorageAuthDefPtr ret = NULL;
if (VIR_ALLOC(ret) < 0)
if (VIR_ALLOC(authdef) < 0)
return NULL;
if (VIR_STRDUP(ret->username, src->username) < 0)
goto error;
if (VIR_STRDUP(authdef->username, src->username) < 0)
goto cleanup;
/* Not present for storage pool, but used for disk source */
if (VIR_STRDUP(ret->secrettype, src->secrettype) < 0)
goto error;
ret->authType = src->authType;
if (VIR_STRDUP(authdef->secrettype, src->secrettype) < 0)
goto cleanup;
authdef->authType = src->authType;
if (virSecretLookupDefCopy(&ret->seclookupdef, &src->seclookupdef) < 0)
goto error;
if (virSecretLookupDefCopy(&authdef->seclookupdef, &src->seclookupdef) < 0)
goto cleanup;
VIR_STEAL_PTR(ret, authdef);
cleanup:
virStorageAuthDefFree(authdef);
return ret;
error:
virStorageAuthDefFree(ret);
return NULL;
}