NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

secret: Rename variable in virSecretObjListAdd

Browse Source 
Rename @def to @objdef - it'll make future patches easier.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-05-31 14:54:27 -04:00
parent f9ccfd5962
commit 602b4c3010
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/conf/virsecretobj.c
View File

@ -332,7 +332,7 @@ virSecretObjListAdd(virSecretObjListPtr secrets,
virSecretDefPtr *oldDef) virSecretDefPtr *oldDef)
{ {
virSecretObjPtr obj; virSecretObjPtr obj;
virSecretDefPtr def; virSecretDefPtr objdef;
virSecretObjPtr ret = NULL; virSecretObjPtr ret = NULL;
char uuidstr[VIR_UUID_STRING_BUFLEN]; char uuidstr[VIR_UUID_STRING_BUFLEN];
char *configFile = NULL, *base64File = NULL; char *configFile = NULL, *base64File = NULL;
@ -347,26 +347,26 @@ virSecretObjListAdd(virSecretObjListPtr secrets,
/* Is there a secret already matching this UUID */ /* Is there a secret already matching this UUID */
if ((obj = virSecretObjListFindByUUIDLocked(secrets, uuidstr))) { if ((obj = virSecretObjListFindByUUIDLocked(secrets, uuidstr))) {
virObjectLock(obj); virObjectLock(obj);
def = obj->def; objdef = obj->def;
if (STRNEQ_NULLABLE(def->usage_id, newdef->usage_id)) { if (STRNEQ_NULLABLE(objdef->usage_id, newdef->usage_id)) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("a secret with UUID %s is already defined for " _("a secret with UUID %s is already defined for "
"use with %s"), "use with %s"),
uuidstr, def->usage_id); uuidstr, objdef->usage_id);
goto cleanup; goto cleanup;
} }
if (def->isprivate && !newdef->isprivate) { if (objdef->isprivate && !newdef->isprivate) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("cannot change private flag on existing secret")); _("cannot change private flag on existing secret"));
goto cleanup; goto cleanup;
} }
if (oldDef) if (oldDef)
*oldDef = def; *oldDef = objdef;
else else
virSecretDefFree(def); virSecretDefFree(objdef);
obj->def = newdef; obj->def = newdef;
} else { } else {
/* No existing secret with same UUID, /* No existing secret with same UUID,
@ -375,8 +375,8 @@ virSecretObjListAdd(virSecretObjListPtr secrets,
newdef->usage_type, newdef->usage_type,
newdef->usage_id))) { newdef->usage_id))) {
virObjectLock(obj); virObjectLock(obj);
def = obj->def; objdef = obj->def;
virUUIDFormat(def->uuid, uuidstr); virUUIDFormat(objdef->uuid, uuidstr);
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("a secret with UUID %s already defined for " _("a secret with UUID %s already defined for "
"use with %s"), "use with %s"),