From nobody Thu May 15 23:14:32 2025 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.zohomail.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 1502890757792680.7196674198537; Wed, 16 Aug 2017 06:39:17 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0D69DC004782; Wed, 16 Aug 2017 13:39:15 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CDAA87DE10; Wed, 16 Aug 2017 13:39:14 +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 8CDE93FAD2; Wed, 16 Aug 2017 13:39:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v7GDd5gF010461 for ; Wed, 16 Aug 2017 09:39:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4C92367CE3; Wed, 16 Aug 2017 13:39:05 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-181.phx2.redhat.com [10.3.116.181]) by smtp.corp.redhat.com (Postfix) with ESMTP id 12D1F65EA8 for ; Wed, 16 Aug 2017 13:39:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 0D69DC004782 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: John Ferlan To: libvir-list@redhat.com Date: Wed, 16 Aug 2017 09:38:59 -0400 Message-Id: <20170816133900.28745-4-jferlan@redhat.com> In-Reply-To: <20170816133900.28745-1-jferlan@redhat.com> References: <20170816133900.28745-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/4] secret: Alter @aclfilter to just @filter 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 16 Aug 2017 13:39:15 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Rename the variable, recent review requested just use of @filter, so be consistent throughout. Signed-off-by: John Ferlan --- src/conf/virsecretobj.c | 24 ++++++++++++------------ src/conf/virsecretobj.h | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index aa994ba..4dca152 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -412,7 +412,7 @@ virSecretObjListAdd(virSecretObjListPtr secrets, =20 struct virSecretCountData { virConnectPtr conn; - virSecretObjListACLFilter aclfilter; + virSecretObjListACLFilter filter; int count; }; =20 @@ -428,7 +428,7 @@ virSecretObjListNumOfSecretsCallback(void *payload, virObjectLock(obj); def =3D obj->def; =20 - if (data->aclfilter && !data->aclfilter(data->conn, def)) + if (data->filter && !data->filter(data->conn, def)) goto cleanup; =20 data->count++; @@ -441,7 +441,7 @@ virSecretObjListNumOfSecretsCallback(void *payload, =20 struct virSecretListData { virConnectPtr conn; - virSecretObjListACLFilter aclfilter; + virSecretObjListACLFilter filter; int nuuids; char **uuids; int maxuuids; @@ -467,7 +467,7 @@ virSecretObjListGetUUIDsCallback(void *payload, virObjectLock(obj); def =3D obj->def; =20 - if (data->aclfilter && !data->aclfilter(data->conn, def)) + if (data->filter && !data->filter(data->conn, def)) goto cleanup; =20 if (data->uuids) { @@ -490,11 +490,11 @@ virSecretObjListGetUUIDsCallback(void *payload, =20 int virSecretObjListNumOfSecrets(virSecretObjListPtr secrets, - virSecretObjListACLFilter aclfilter, + virSecretObjListACLFilter filter, virConnectPtr conn) { struct virSecretCountData data =3D { - .conn =3D conn, .aclfilter =3D aclfilter, .count =3D 0 }; + .conn =3D conn, .filter =3D filter, .count =3D 0 }; =20 virObjectLock(secrets); virHashForEach(secrets->objs, virSecretObjListNumOfSecretsCallback, &d= ata); @@ -535,7 +535,7 @@ virSecretObjMatchFlags(virSecretObjPtr obj, struct virSecretObjListData { virConnectPtr conn; virSecretPtr *secrets; - virSecretObjListACLFilter aclfilter; + virSecretObjListACLFilter filter; unsigned int flags; int nsecrets; bool error; @@ -557,7 +557,7 @@ virSecretObjListExportCallback(void *payload, virObjectLock(obj); def =3D obj->def; =20 - if (data->aclfilter && !data->aclfilter(data->conn, def)) + if (data->filter && !data->filter(data->conn, def)) goto cleanup; =20 if (!virSecretObjMatchFlags(obj, data->flags)) @@ -587,12 +587,12 @@ int virSecretObjListExport(virConnectPtr conn, virSecretObjListPtr secretobjs, virSecretPtr **secrets, - virSecretObjListACLFilter aclfilter, + virSecretObjListACLFilter filter, unsigned int flags) { struct virSecretObjListData data =3D { .conn =3D conn, .secrets =3D NULL, - .aclfilter =3D aclfilter, .flags =3D flags, + .filter =3D filter, .flags =3D flags, .nsecrets =3D 0, .error =3D false }; =20 virObjectLock(secretobjs); @@ -626,11 +626,11 @@ int virSecretObjListGetUUIDs(virSecretObjListPtr secrets, char **uuids, int maxuuids, - virSecretObjListACLFilter aclfilter, + virSecretObjListACLFilter filter, virConnectPtr conn) { struct virSecretListData data =3D { - .conn =3D conn, .aclfilter =3D aclfilter, .uuids =3D uuids, .nuuid= s =3D 0, + .conn =3D conn, .filter =3D filter, .uuids =3D uuids, .nuuids =3D = 0, .maxuuids =3D maxuuids, .error =3D false }; =20 virObjectLock(secrets); diff --git a/src/conf/virsecretobj.h b/src/conf/virsecretobj.h index 0196813..d412ee6 100644 --- a/src/conf/virsecretobj.h +++ b/src/conf/virsecretobj.h @@ -63,21 +63,21 @@ typedef bool =20 int virSecretObjListNumOfSecrets(virSecretObjListPtr secrets, - virSecretObjListACLFilter aclfilter, + virSecretObjListACLFilter filter, virConnectPtr conn); =20 int virSecretObjListExport(virConnectPtr conn, virSecretObjListPtr secretobjs, virSecretPtr **secrets, - virSecretObjListACLFilter aclfilter, + virSecretObjListACLFilter filter, unsigned int flags); =20 int virSecretObjListGetUUIDs(virSecretObjListPtr secrets, char **uuids, int maxuuids, - virSecretObjListACLFilter aclfilter, + virSecretObjListACLFilter filter, virConnectPtr conn); =20 int --=20 2.9.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list