From nobody Fri May 16 03:04:30 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 1501081694165547.7374127908006; Wed, 26 Jul 2017 08:08:14 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 166D8C0B7703; Wed, 26 Jul 2017 15:08:08 +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 D96035D96D; Wed, 26 Jul 2017 15:08:07 +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 3ADB1180597B; Wed, 26 Jul 2017 15:08:07 +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 v6QF85hI029054 for ; Wed, 26 Jul 2017 11:08:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id A4D9E69524; Wed, 26 Jul 2017 15:08:05 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-46.phx2.redhat.com [10.3.117.46]) by smtp.corp.redhat.com (Postfix) with ESMTP id 69DF66929A for ; Wed, 26 Jul 2017 15:07:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 166D8C0B7703 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.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, 26 Jul 2017 11:05:36 -0400 Message-Id: <20170726150537.4619-20-jferlan@redhat.com> In-Reply-To: <20170726150537.4619-1-jferlan@redhat.com> References: <20170726150537.4619-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 19/20] network: Modify naming for virNetworkObjList* fetching APIs 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 26 Jul 2017 15:08:09 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Use the structure names in the @data setup - makes it easier than going back to find the struct fields to make sure the order of the data is correct. Signed-off-by: John Ferlan --- src/conf/virnetworkobj.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 2be48dd..aab737b 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1360,7 +1360,9 @@ virNetworkObjListExport(virConnectPtr conn, unsigned int flags) { int ret =3D -1; - struct virNetworkObjListData data =3D { conn, NULL, aclfilter, flags, = 0, false}; + struct virNetworkObjListData data =3D { + .conn =3D conn, .nets =3D NULL, .aclfilter =3D aclfilter, .flags = =3D flags, + .nnets =3D 0, .error =3D false }; =20 virObjectLock(netobjs); if (nets && VIR_ALLOC_N(data.nets, virHashSize(netobjs->objs) + 1) < 0) @@ -1426,7 +1428,8 @@ virNetworkObjListForEach(virNetworkObjListPtr nets, virNetworkObjListIterator callback, void *opaque) { - struct virNetworkObjListForEachHelperData data =3D {callback, opaque, = 0}; + struct virNetworkObjListForEachHelperData data =3D { + .callback =3D callback, .opaque =3D opaque, .ret =3D 0}; virObjectLock(nets); virHashForEach(nets->objs, virNetworkObjListForEachHelper, &data); virObjectUnlock(nets); @@ -1492,7 +1495,8 @@ virNetworkObjListGetNames(virNetworkObjListPtr nets, int ret =3D -1; =20 struct virNetworkObjListGetHelperData data =3D { - conn, aclfilter, names, maxnames, active, 0, false}; + .conn =3D conn, .aclfilter =3D aclfilter, .names =3D names, + .maxnames =3D maxnames, .active =3D active, .got =3D 0, .error =3D= false}; =20 virObjectLock(nets); virHashForEach(nets->objs, virNetworkObjListGetHelper, &data); @@ -1518,7 +1522,8 @@ virNetworkObjListNumOfNetworks(virNetworkObjListPtr n= ets, virConnectPtr conn) { struct virNetworkObjListGetHelperData data =3D { - conn, aclfilter, NULL, -1, active, 0, false}; + .conn =3D conn, .aclfilter =3D aclfilter, .names =3D NULL, + .maxnames =3D -1, .active =3D active, .got =3D 0, .error =3D false= }; =20 virObjectLock(nets); virHashForEach(nets->objs, virNetworkObjListGetHelper, &data); --=20 2.9.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list