From nobody Mon Feb 9 20:31:15 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1496496467043975.2549220484914; Sat, 3 Jun 2017 06:27:47 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 664EA80F63; Sat, 3 Jun 2017 13:27:44 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2C43282497; Sat, 3 Jun 2017 13:27:44 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 71F9D1841C80; Sat, 3 Jun 2017 13:27:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v53DRgbJ008465 for ; Sat, 3 Jun 2017 09:27:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3701278371; Sat, 3 Jun 2017 13:27:42 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-124.phx2.redhat.com [10.3.116.124]) by smtp.corp.redhat.com (Postfix) with ESMTP id E9B8A17F25 for ; Sat, 3 Jun 2017 13:27:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 664EA80F63 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 664EA80F63 From: John Ferlan To: libvir-list@redhat.com Date: Sat, 3 Jun 2017 09:27:32 -0400 Message-Id: <20170603132737.27650-4-jferlan@redhat.com> In-Reply-To: <20170603132737.27650-1-jferlan@redhat.com> References: <20170603132737.27650-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/8] secret: Rename variable in virSecretObjListAdd X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Sat, 03 Jun 2017 13:27:45 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Rename @def to @objdef - it'll make future patches easier. Signed-off-by: John Ferlan --- src/conf/virsecretobj.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index 62b86b7..e3bcbe5 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -332,7 +332,7 @@ virSecretObjListAdd(virSecretObjListPtr secrets, virSecretDefPtr *oldDef) { virSecretObjPtr obj; - virSecretDefPtr def; + virSecretDefPtr objdef; virSecretObjPtr ret =3D NULL; char uuidstr[VIR_UUID_STRING_BUFLEN]; char *configFile =3D NULL, *base64File =3D NULL; @@ -347,26 +347,26 @@ virSecretObjListAdd(virSecretObjListPtr secrets, /* Is there a secret already matching this UUID */ if ((obj =3D virSecretObjListFindByUUIDLocked(secrets, uuidstr))) { virObjectLock(obj); - def =3D obj->def; + objdef =3D obj->def; =20 - if (STRNEQ_NULLABLE(def->usage_id, newdef->usage_id)) { + if (STRNEQ_NULLABLE(objdef->usage_id, newdef->usage_id)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("a secret with UUID %s is already defined for= " "use with %s"), - uuidstr, def->usage_id); + uuidstr, objdef->usage_id); goto cleanup; } =20 - if (def->isprivate && !newdef->isprivate) { + if (objdef->isprivate && !newdef->isprivate) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot change private flag on existing secre= t")); goto cleanup; } =20 if (oldDef) - *oldDef =3D def; + *oldDef =3D objdef; else - virSecretDefFree(def); + virSecretDefFree(objdef); obj->def =3D newdef; } else { /* No existing secret with same UUID, @@ -375,8 +375,8 @@ virSecretObjListAdd(virSecretObjListPtr secrets, newdef->usage_type, newdef->usage_id))) { virObjectLock(obj); - def =3D obj->def; - virUUIDFormat(def->uuid, uuidstr); + objdef =3D obj->def; + virUUIDFormat(objdef->uuid, uuidstr); virReportError(VIR_ERR_INTERNAL_ERROR, _("a secret with UUID %s already defined for " "use with %s"), --=20 2.9.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list