From nobody Thu May 15 23:16:47 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 1502890756986686.8182014689619; Wed, 16 Aug 2017 06:39:16 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 065317CDF0; Wed, 16 Aug 2017 13:39:15 +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 D6BC46063E; 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 967A21806106; 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 v7GDd5AU010467 for ; Wed, 16 Aug 2017 09:39:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id D083C67CE3; 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 99CA565EA8 for ; Wed, 16 Aug 2017 13:39:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 065317CDF0 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.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:39:00 -0400 Message-Id: <20170816133900.28745-5-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 4/4] storage: 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); 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/virstorageobj.c | 20 ++++++++++---------- src/conf/virstorageobj.h | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 23346f3..e83044b 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -198,7 +198,7 @@ virStorageVolDefFindByName(virStoragePoolObjPtr obj, int virStoragePoolObjNumOfVolumes(virStoragePoolObjPtr obj, virConnectPtr conn, - virStoragePoolVolumeACLFilter aclfilter) + virStoragePoolVolumeACLFilter filter) { virStoragePoolDefPtr pooldef =3D obj->def; virStorageVolDefListPtr volumes =3D &obj->volumes; @@ -207,7 +207,7 @@ virStoragePoolObjNumOfVolumes(virStoragePoolObjPtr obj, =20 for (i =3D 0; i < volumes->count; i++) { virStorageVolDefPtr def =3D volumes->objs[i]; - if (aclfilter && !aclfilter(conn, pooldef, def)) + if (filter && !filter(conn, pooldef, def)) continue; nvolumes++; } @@ -219,7 +219,7 @@ virStoragePoolObjNumOfVolumes(virStoragePoolObjPtr obj, int virStoragePoolObjVolumeGetNames(virStoragePoolObjPtr obj, virConnectPtr conn, - virStoragePoolVolumeACLFilter aclfilter, + virStoragePoolVolumeACLFilter filter, char **const names, int maxnames) { @@ -230,7 +230,7 @@ virStoragePoolObjVolumeGetNames(virStoragePoolObjPtr ob= j, =20 for (i =3D 0; i < volumes->count && nnames < maxnames; i++) { virStorageVolDefPtr def =3D volumes->objs[i]; - if (aclfilter && !aclfilter(conn, pooldef, def)) + if (filter && !filter(conn, pooldef, def)) continue; if (VIR_STRDUP(names[nnames], def->name) < 0) goto failure; @@ -251,7 +251,7 @@ int virStoragePoolObjVolumeListExport(virConnectPtr conn, virStoragePoolObjPtr obj, virStorageVolPtr **vols, - virStoragePoolVolumeACLFilter aclfilter) + virStoragePoolVolumeACLFilter filter) { virStoragePoolDefPtr pooldef =3D obj->def; virStorageVolDefListPtr volumes =3D &obj->volumes; @@ -272,7 +272,7 @@ virStoragePoolObjVolumeListExport(virConnectPtr conn, =20 for (i =3D 0; i < volumes->count; i++) { virStorageVolDefPtr def =3D volumes->objs[i]; - if (aclfilter && !aclfilter(conn, pooldef, def)) + if (filter && !filter(conn, pooldef, def)) continue; if (!(vol =3D virGetStorageVol(conn, pooldef->name, def->name, def= ->key, NULL, NULL))) @@ -562,7 +562,7 @@ int virStoragePoolObjNumOfStoragePools(virStoragePoolObjListPtr pools, virConnectPtr conn, bool wantActive, - virStoragePoolObjListACLFilter aclfilte= r) + virStoragePoolObjListACLFilter filter) { int npools =3D 0; size_t i; @@ -570,7 +570,7 @@ virStoragePoolObjNumOfStoragePools(virStoragePoolObjLis= tPtr pools, for (i =3D 0; i < pools->count; i++) { virStoragePoolObjPtr obj =3D pools->objs[i]; virStoragePoolObjLock(obj); - if (!aclfilter || aclfilter(conn, obj->def)) { + if (!filter || filter(conn, obj->def)) { if (wantActive =3D=3D virStoragePoolObjIsActive(obj)) npools++; } @@ -585,7 +585,7 @@ int virStoragePoolObjGetNames(virStoragePoolObjListPtr pools, virConnectPtr conn, bool wantActive, - virStoragePoolObjListACLFilter aclfilter, + virStoragePoolObjListACLFilter filter, char **const names, int maxnames) { @@ -595,7 +595,7 @@ virStoragePoolObjGetNames(virStoragePoolObjListPtr pool= s, for (i =3D 0; i < pools->count && nnames < maxnames; i++) { virStoragePoolObjPtr obj =3D pools->objs[i]; virStoragePoolObjLock(obj); - if (!aclfilter || aclfilter(conn, obj->def)) { + if (!filter || filter(conn, obj->def)) { if (wantActive =3D=3D virStoragePoolObjIsActive(obj)) { if (VIR_STRDUP(names[nnames], obj->def->name) < 0) { virStoragePoolObjUnlock(obj); diff --git a/src/conf/virstorageobj.h b/src/conf/virstorageobj.h index 5a61b2a..ac51b5f 100644 --- a/src/conf/virstorageobj.h +++ b/src/conf/virstorageobj.h @@ -116,12 +116,12 @@ typedef bool int virStoragePoolObjNumOfVolumes(virStoragePoolObjPtr obj, virConnectPtr conn, - virStoragePoolVolumeACLFilter aclfilter); + virStoragePoolVolumeACLFilter filter); =20 int virStoragePoolObjVolumeGetNames(virStoragePoolObjPtr obj, virConnectPtr conn, - virStoragePoolVolumeACLFilter aclfilter, + virStoragePoolVolumeACLFilter filter, char **const names, int maxnames); =20 @@ -129,7 +129,7 @@ int virStoragePoolObjVolumeListExport(virConnectPtr conn, virStoragePoolObjPtr obj, virStorageVolPtr **vols, - virStoragePoolVolumeACLFilter aclfilter); + virStoragePoolVolumeACLFilter filter); =20 virStoragePoolObjPtr virStoragePoolObjAssignDef(virStoragePoolObjListPtr pools, @@ -150,13 +150,13 @@ int virStoragePoolObjNumOfStoragePools(virStoragePoolObjListPtr pools, virConnectPtr conn, bool wantActive, - virStoragePoolObjListACLFilter aclfilte= r); + virStoragePoolObjListACLFilter filter); =20 int virStoragePoolObjGetNames(virStoragePoolObjListPtr pools, virConnectPtr conn, bool wantActive, - virStoragePoolObjListACLFilter aclfilter, + virStoragePoolObjListACLFilter filter, char **const names, int maxnames); =20 --=20 2.9.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list