shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 06:50:22 +03:00
Code Releases Activity

secret: Combine virSecretObjListAdd with Locked function

Browse Source 
There's no need to separate, so just have one.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-04-20 07:33:26 -04:00
parent 850792f2d3
commit 24d33d18ba
1 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/conf/virsecretobj.c
View File

@ -319,7 +319,7 @@ virSecretObjListRemove(virSecretObjListPtr secrets,
/*
* virSecretObjListAddLocked:
* virSecretObjListAdd:
* @secrets: list of secret objects
* @newdef: new secret definition
* @configDir: directory to place secret config files
@ -327,15 +327,13 @@ virSecretObjListRemove(virSecretObjListPtr secrets,
*
* Add the new @newdef to the secret obj table hash
*
* This functions requires @secrets to be locked already!
*
* Returns pointer to secret or NULL if failure to add
* Returns: locked and ref'd secret or NULL if failure to add
*/
static virSecretObjPtr
virSecretObjListAddLocked(virSecretObjListPtr secrets,
virSecretDefPtr newdef,
const char *configDir,
virSecretDefPtr *oldDef)
virSecretObjPtr
virSecretObjListAdd(virSecretObjListPtr secrets,
virSecretDefPtr newdef,
const char *configDir,
virSecretDefPtr *oldDef)
{
virSecretObjPtr obj;
virSecretDefPtr def;
@ -343,6 +341,8 @@ virSecretObjListAddLocked(virSecretObjListPtr secrets,
char uuidstr[VIR_UUID_STRING_BUFLEN];
char *configFile = NULL, *base64File = NULL;
virObjectLock(secrets);
if (oldDef)
*oldDef = NULL;
@ -414,22 +414,8 @@ virSecretObjListAddLocked(virSecretObjListPtr secrets,
virSecretObjEndAPI(&obj);
VIR_FREE(configFile);
VIR_FREE(base64File);
return ret;
}
virSecretObjPtr
virSecretObjListAdd(virSecretObjListPtr secrets,
virSecretDefPtr newdef,
const char *configDir,
virSecretDefPtr *oldDef)
{
virSecretObjPtr obj;
virObjectLock(secrets);
obj = virSecretObjListAddLocked(secrets, newdef, configDir, oldDef);
virObjectUnlock(secrets);
return obj;
return ret;
}