From nobody Sun Feb 8 19:54:41 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 149204186740145.34583373780458; Wed, 12 Apr 2017 17:04:27 -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 285A93D952; Thu, 13 Apr 2017 00:04:26 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F38FC1711A; Thu, 13 Apr 2017 00:04:25 +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 9EE841F8; Thu, 13 Apr 2017 00:04:25 +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 v3D04Nur012169 for ; Wed, 12 Apr 2017 20:04:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id 854BC173F3; Thu, 13 Apr 2017 00:04:23 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-15.phx2.redhat.com [10.3.116.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 40DC017187 for ; Thu, 13 Apr 2017 00:04:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 285A93D952 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.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 285A93D952 From: John Ferlan To: libvir-list@redhat.com Date: Wed, 12 Apr 2017 20:04:15 -0400 Message-Id: <20170413000418.30018-3-jferlan@redhat.com> In-Reply-To: <20170413000418.30018-1-jferlan@redhat.com> References: <20170413000418.30018-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [REPOST PATCH 2/5] conf: Adjust coding style for network conf sources 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.30]); Thu, 13 Apr 2017 00:04:26 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Alter the format of the code to follow more recent style guidelines of two empty lines between functions, function decls with "[static] type" on one line followed by function name with arguments to functions each on one line. Signed-off-by: John Ferlan --- src/conf/network_conf.c | 103 ++++++++++++++++++++++++++++++++++++++-----= ---- src/conf/virnetworkobj.c | 87 +++++++++++++++++++++++++++++---------- 2 files changed, 151 insertions(+), 39 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index f3e0622..3ebf67f 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -80,6 +80,7 @@ virPortGroupDefClear(virPortGroupDefPtr def) def->bandwidth =3D NULL; } =20 + static void virNetworkForwardIfDefClear(virNetworkForwardIfDefPtr def) { @@ -87,12 +88,14 @@ virNetworkForwardIfDefClear(virNetworkForwardIfDefPtr d= ef) VIR_FREE(def->device.dev); } =20 + static void virNetworkForwardPfDefClear(virNetworkForwardPfDefPtr def) { VIR_FREE(def->dev); } =20 + static void virNetworkDHCPHostDefClear(virNetworkDHCPHostDefPtr def) { @@ -101,6 +104,7 @@ virNetworkDHCPHostDefClear(virNetworkDHCPHostDefPtr def) VIR_FREE(def->name); } =20 + static void virNetworkIPDefClear(virNetworkIPDefPtr def) { @@ -115,6 +119,7 @@ virNetworkIPDefClear(virNetworkIPDefPtr def) VIR_FREE(def->bootfile); } =20 + static void virNetworkDNSTxtDefClear(virNetworkDNSTxtDefPtr def) { @@ -122,6 +127,7 @@ virNetworkDNSTxtDefClear(virNetworkDNSTxtDefPtr def) VIR_FREE(def->value); } =20 + static void virNetworkDNSHostDefClear(virNetworkDNSHostDefPtr def) { @@ -130,6 +136,7 @@ virNetworkDNSHostDefClear(virNetworkDNSHostDefPtr def) VIR_FREE(def->names); } =20 + static void virNetworkDNSSrvDefClear(virNetworkDNSSrvDefPtr def) { @@ -172,6 +179,7 @@ virNetworkDNSDefClear(virNetworkDNSDefPtr def) } } =20 + static void virNetworkForwardDefClear(virNetworkForwardDefPtr def) { @@ -187,6 +195,7 @@ virNetworkForwardDefClear(virNetworkForwardDefPtr def) def->nifs =3D def->npfs =3D 0; } =20 + void virNetworkDefFree(virNetworkDefPtr def) { @@ -225,6 +234,7 @@ virNetworkDefFree(virNetworkDefPtr def) VIR_FREE(def); } =20 + /* * virNetworkDefCopy: * @def: NetworkDef to copy @@ -255,10 +265,12 @@ virNetworkDefCopy(virNetworkDefPtr def, unsigned int = flags) return newDef; } =20 + /* return ips[index], or NULL if there aren't enough ips */ virNetworkIPDefPtr virNetworkDefGetIPByIndex(const virNetworkDef *def, - int family, size_t n) + int family, + size_t n) { size_t i; =20 @@ -279,10 +291,12 @@ virNetworkDefGetIPByIndex(const virNetworkDef *def, return NULL; } =20 + /* return routes[index], or NULL if there aren't enough routes */ virNetDevIPRoutePtr virNetworkDefGetRouteByIndex(const virNetworkDef *def, - int family, size_t n) + int family, + size_t n) { size_t i; =20 @@ -305,16 +319,19 @@ virNetworkDefGetRouteByIndex(const virNetworkDef *def, return NULL; } =20 + /* return number of 1 bits in netmask for the network's ipAddress, * or -1 on error */ -int virNetworkIPDefPrefix(const virNetworkIPDef *def) +int +virNetworkIPDefPrefix(const virNetworkIPDef *def) { return virSocketAddrGetIPPrefix(&def->address, &def->netmask, def->prefix); } =20 + /* Fill in a virSocketAddr with the proper netmask for this * definition, based on either the definition's netmask, or its * prefix. Return -1 on error (and set the netmask family to AF_UNSPEC) @@ -374,6 +391,7 @@ virSocketAddrRangeParseXML(const char *networkName, return ret; } =20 + static int virNetworkDHCPHostDefParseXML(const char *networkName, virNetworkIPDefPtr def, @@ -494,6 +512,7 @@ virNetworkDHCPHostDefParseXML(const char *networkName, return ret; } =20 + static int virNetworkDHCPDefParseXML(const char *networkName, xmlNodePtr node, @@ -561,6 +580,7 @@ virNetworkDHCPDefParseXML(const char *networkName, return ret; } =20 + static int virNetworkDNSHostDefParseXML(const char *networkName, xmlNodePtr node, @@ -628,6 +648,7 @@ virNetworkDNSHostDefParseXML(const char *networkName, return -1; } =20 + /* This includes all characters used in the names of current * /etc/services and /etc/protocols files (on Fedora 20), except ".", * which we can't allow because it would conflict with the use of "." @@ -755,6 +776,7 @@ virNetworkDNSSrvDefParseXML(const char *networkName, return -1; } =20 + static int virNetworkDNSTxtDefParseXML(const char *networkName, xmlNodePtr node, @@ -795,6 +817,7 @@ virNetworkDNSTxtDefParseXML(const char *networkName, return -1; } =20 + static int virNetworkDNSDefParseXML(const char *networkName, xmlNodePtr node, @@ -953,6 +976,7 @@ virNetworkDNSDefParseXML(const char *networkName, return ret; } =20 + static int virNetworkIPDefParseXML(const char *networkName, xmlNodePtr node, @@ -1108,6 +1132,7 @@ virNetworkIPDefParseXML(const char *networkName, return result; } =20 + static int virNetworkPortGroupParseXML(virPortGroupDefPtr def, xmlNodePtr node, @@ -1179,6 +1204,7 @@ virNetworkPortGroupParseXML(virPortGroupDefPtr def, return result; } =20 + static int virNetworkForwardNatDefParseXML(const char *networkName, xmlNodePtr node, @@ -1307,6 +1333,7 @@ virNetworkForwardNatDefParseXML(const char *networkNa= me, return ret; } =20 + static int virNetworkForwardDefParseXML(const char *networkName, xmlNodePtr node, @@ -1555,6 +1582,7 @@ virNetworkForwardDefParseXML(const char *networkName, return ret; } =20 + virNetworkDefPtr virNetworkDefParseXML(xmlXPathContextPtr ctxt) { @@ -1966,6 +1994,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) return NULL; } =20 + static virNetworkDefPtr virNetworkDefParse(const char *xmlStr, const char *filename) @@ -1983,19 +2012,24 @@ virNetworkDefParse(const char *xmlStr, return def; } =20 -virNetworkDefPtr virNetworkDefParseString(const char *xmlStr) + +virNetworkDefPtr +virNetworkDefParseString(const char *xmlStr) { return virNetworkDefParse(xmlStr, NULL); } =20 -virNetworkDefPtr virNetworkDefParseFile(const char *filename) + +virNetworkDefPtr +virNetworkDefParseFile(const char *filename) { return virNetworkDefParse(NULL, filename); } =20 =20 -virNetworkDefPtr virNetworkDefParseNode(xmlDocPtr xml, - xmlNodePtr root) +virNetworkDefPtr +virNetworkDefParseNode(xmlDocPtr xml, + xmlNodePtr root) { xmlXPathContextPtr ctxt =3D NULL; virNetworkDefPtr def =3D NULL; @@ -2129,6 +2163,7 @@ virNetworkDNSDefFormat(virBufferPtr buf, return 0; } =20 + static int virNetworkIPDefFormat(virBufferPtr buf, const virNetworkIPDef *def) @@ -2230,6 +2265,7 @@ virNetworkIPDefFormat(virBufferPtr buf, return result; } =20 + static int virPortGroupDefFormat(virBufferPtr buf, const virPortGroupDef *def) @@ -2252,6 +2288,7 @@ virPortGroupDefFormat(virBufferPtr buf, return 0; } =20 + static int virNetworkForwardNatDefFormat(virBufferPtr buf, const virNetworkForwardDef *fwd) @@ -2302,6 +2339,7 @@ virNetworkForwardNatDefFormat(virBufferPtr buf, return ret; } =20 + int virNetworkDefFormatBuf(virBufferPtr buf, const virNetworkDef *def, @@ -2516,6 +2554,7 @@ virNetworkDefFormatBuf(virBufferPtr buf, return -1; } =20 + char * virNetworkDefFormat(const virNetworkDef *def, unsigned int flags) @@ -2535,16 +2574,20 @@ virNetworkDefFormat(const virNetworkDef *def, return NULL; } =20 + const char * -virNetworkDefForwardIf(const virNetworkDef *def, size_t n) +virNetworkDefForwardIf(const virNetworkDef *def, + size_t n) { return ((def->forward.ifs && (def->forward.nifs > n) && def->forward.ifs[n].type =3D=3D VIR_NETWORK_FORWARD_HOSTDEV_D= EVICE_NETDEV) ? def->forward.ifs[n].device.dev : NULL); } =20 -virPortGroupDefPtr virPortGroupFindByName(virNetworkDefPtr net, - const char *portgroup) + +virPortGroupDefPtr +virPortGroupFindByName(virNetworkDefPtr net, + const char *portgroup) { size_t i; for (i =3D 0; i < net->nPortGroups; i++) { @@ -2559,9 +2602,11 @@ virPortGroupDefPtr virPortGroupFindByName(virNetwork= DefPtr net, return NULL; } =20 -int virNetworkSaveXML(const char *configDir, - virNetworkDefPtr def, - const char *xml) + +int +virNetworkSaveXML(const char *configDir, + virNetworkDefPtr def, + const char *xml) { char uuidstr[VIR_UUID_STRING_BUFLEN]; char *configFile =3D NULL; @@ -2587,8 +2632,10 @@ int virNetworkSaveXML(const char *configDir, return ret; } =20 -int virNetworkSaveConfig(const char *configDir, - virNetworkDefPtr def) + +int +virNetworkSaveConfig(const char *configDir, + virNetworkDefPtr def) { int ret =3D -1; char *xml; @@ -2605,8 +2652,10 @@ int virNetworkSaveConfig(const char *configDir, return ret; } =20 -char *virNetworkConfigFile(const char *dir, - const char *name) + +char * +virNetworkConfigFile(const char *dir, + const char *name) { char *ret =3D NULL; =20 @@ -2614,7 +2663,9 @@ char *virNetworkConfigFile(const char *dir, return ret; } =20 -void virNetworkSetBridgeMacAddr(virNetworkDefPtr def) + +void +virNetworkSetBridgeMacAddr(virNetworkDefPtr def) { if (!def->mac_specified) { /* if the bridge doesn't have a mac address explicitly defined, @@ -2626,6 +2677,7 @@ void virNetworkSetBridgeMacAddr(virNetworkDefPtr def) } } =20 + /* NetworkObj backend of the virNetworkUpdate API */ =20 static void @@ -2636,6 +2688,7 @@ virNetworkDefUpdateNoSupport(virNetworkDefPtr def, co= nst char *section) section, def->name); } =20 + static void virNetworkDefUpdateUnknownCommand(unsigned int command) { @@ -2643,6 +2696,7 @@ virNetworkDefUpdateUnknownCommand(unsigned int comman= d) _("unrecognized network update command code %d"), comma= nd); } =20 + static int virNetworkDefUpdateCheckElementName(virNetworkDefPtr def, xmlNodePtr node, @@ -2658,6 +2712,7 @@ virNetworkDefUpdateCheckElementName(virNetworkDefPtr = def, return 0; } =20 + static int virNetworkDefUpdateBridge(virNetworkDefPtr def, unsigned int command ATTRIBUTE_UNUSED, @@ -2670,6 +2725,7 @@ virNetworkDefUpdateBridge(virNetworkDefPtr def, return -1; } =20 + static int virNetworkDefUpdateDomain(virNetworkDefPtr def, unsigned int command ATTRIBUTE_UNUSED, @@ -2682,6 +2738,7 @@ virNetworkDefUpdateDomain(virNetworkDefPtr def, return -1; } =20 + static int virNetworkDefUpdateIP(virNetworkDefPtr def, unsigned int command ATTRIBUTE_UNUSED, @@ -2694,6 +2751,7 @@ virNetworkDefUpdateIP(virNetworkDefPtr def, return -1; } =20 + static virNetworkIPDefPtr virNetworkIPDefByIndex(virNetworkDefPtr def, int parentIndex) { @@ -2897,6 +2955,7 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def, return ret; } =20 + static int virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, unsigned int command, @@ -2998,6 +3057,7 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, return ret; } =20 + static int virNetworkDefUpdateForward(virNetworkDefPtr def, unsigned int command ATTRIBUTE_UNUSED, @@ -3010,6 +3070,7 @@ virNetworkDefUpdateForward(virNetworkDefPtr def, return -1; } =20 + static int virNetworkDefUpdateForwardInterface(virNetworkDefPtr def, unsigned int command, @@ -3104,6 +3165,7 @@ virNetworkDefUpdateForwardInterface(virNetworkDefPtr = def, return ret; } =20 + static int virNetworkDefUpdateForwardPF(virNetworkDefPtr def, unsigned int command ATTRIBUTE_UNUSED, @@ -3116,6 +3178,7 @@ virNetworkDefUpdateForwardPF(virNetworkDefPtr def, return -1; } =20 + static int virNetworkDefUpdatePortGroup(virNetworkDefPtr def, unsigned int command, @@ -3210,6 +3273,7 @@ virNetworkDefUpdatePortGroup(virNetworkDefPtr def, return ret; } =20 + static int virNetworkDefUpdateDNSHost(virNetworkDefPtr def, unsigned int command ATTRIBUTE_UNUSED, @@ -3304,6 +3368,7 @@ virNetworkDefUpdateDNSHost(virNetworkDefPtr def, return ret; } =20 + static int virNetworkDefUpdateDNSSrv(virNetworkDefPtr def, unsigned int command ATTRIBUTE_UNUSED, @@ -3390,6 +3455,7 @@ virNetworkDefUpdateDNSSrv(virNetworkDefPtr def, return ret; } =20 + static int virNetworkDefUpdateDNSTxt(virNetworkDefPtr def, unsigned int command ATTRIBUTE_UNUSED, @@ -3463,6 +3529,7 @@ virNetworkDefUpdateDNSTxt(virNetworkDefPtr def, return ret; } =20 + int virNetworkDefUpdateSection(virNetworkDefPtr def, unsigned int command, /* virNetworkUpdateComman= d */ diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 2515858..216c7ae 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -48,7 +48,8 @@ static virClassPtr virNetworkObjListClass; static void virNetworkObjDispose(void *obj); static void virNetworkObjListDispose(void *obj); =20 -static int virNetworkObjOnceInit(void) +static int +virNetworkObjOnceInit(void) { if (!(virNetworkObjClass =3D virClassNew(virClassForObjectLockable(), "virNetworkObj", @@ -93,6 +94,7 @@ virNetworkObjNew(void) return NULL; } =20 + void virNetworkObjEndAPI(virNetworkObjPtr *net) { @@ -104,7 +106,9 @@ virNetworkObjEndAPI(virNetworkObjPtr *net) *net =3D NULL; } =20 -virNetworkObjListPtr virNetworkObjListNew(void) + +virNetworkObjListPtr +virNetworkObjListNew(void) { virNetworkObjListPtr nets; =20 @@ -122,6 +126,7 @@ virNetworkObjListPtr virNetworkObjListNew(void) return nets; } =20 + /** * virNetworkObjFindByUUIDLocked: * @nets: list of network objects @@ -146,6 +151,7 @@ virNetworkObjFindByUUIDLocked(virNetworkObjListPtr nets, return ret; } =20 + /** * virNetworkObjFindByUUID: * @nets: list of network objects @@ -170,6 +176,7 @@ virNetworkObjFindByUUID(virNetworkObjListPtr nets, return ret; } =20 + static int virNetworkObjSearchName(const void *payload, const void *name ATTRIBUTE_UNUSED, @@ -185,6 +192,7 @@ virNetworkObjSearchName(const void *payload, return want; } =20 + /* * virNetworkObjFindByNameLocked: * @nets: list of network objects @@ -206,6 +214,7 @@ virNetworkObjFindByNameLocked(virNetworkObjListPtr nets, return ret; } =20 + /** * virNetworkObjFindByName: * @nets: list of network objects @@ -230,6 +239,7 @@ virNetworkObjFindByName(virNetworkObjListPtr nets, return ret; } =20 + bool virNetworkObjTaint(virNetworkObjPtr obj, virNetworkTaintFlags taint) @@ -255,6 +265,7 @@ virNetworkObjDispose(void *obj) virObjectUnref(net->macmap); } =20 + static void virNetworkObjListDispose(void *obj) { @@ -263,6 +274,7 @@ virNetworkObjListDispose(void *obj) virHashFree(nets->objs); } =20 + /* * virNetworkObjAssignDef: * @network: the network object to update @@ -324,6 +336,7 @@ virNetworkObjAssignDef(virNetworkObjPtr network, } } =20 + /* * If flags & VIR_NETWORK_OBJ_LIST_ADD_CHECK_LIVE then this will * refuse updating an existing def if the current def is live @@ -401,6 +414,7 @@ virNetworkAssignDefLocked(virNetworkObjListPtr nets, return ret; } =20 + /* * virNetworkAssignDef: * @nets: list of all networks @@ -429,6 +443,7 @@ virNetworkAssignDef(virNetworkObjListPtr nets, return network; } =20 + /* * virNetworkObjSetDefTransient: * @network: network object pointer @@ -444,7 +459,8 @@ virNetworkAssignDef(virNetworkObjListPtr nets, * Returns 0 on success, -1 on failure */ int -virNetworkObjSetDefTransient(virNetworkObjPtr network, bool live) +virNetworkObjSetDefTransient(virNetworkObjPtr network, + bool live) { if (!virNetworkObjIsActive(network) && !live) return 0; @@ -456,6 +472,7 @@ virNetworkObjSetDefTransient(virNetworkObjPtr network, = bool live) return network->newDef ? 0 : -1; } =20 + /* virNetworkObjUnsetDefTransient: * * This *undoes* what virNetworkObjSetDefTransient did. @@ -470,6 +487,7 @@ virNetworkObjUnsetDefTransient(virNetworkObjPtr network) } } =20 + /* * virNetworkObjGetPersistentDef: * @network: network object pointer @@ -488,6 +506,7 @@ virNetworkObjGetPersistentDef(virNetworkObjPtr network) return network->def; } =20 + /* * virNetworkObjReplacePersistentDef: * @network: network object pointer @@ -513,6 +532,7 @@ virNetworkObjReplacePersistentDef(virNetworkObjPtr netw= ork, return 0; } =20 + /* * virNetworkConfigChangeSetup: * @@ -525,7 +545,8 @@ virNetworkObjReplacePersistentDef(virNetworkObjPtr netw= ork, * Returns 0 on success, -1 on error. */ int -virNetworkConfigChangeSetup(virNetworkObjPtr network, unsigned int flags) +virNetworkConfigChangeSetup(virNetworkObjPtr network, + unsigned int flags) { bool isActive; int ret =3D -1; @@ -557,8 +578,10 @@ virNetworkConfigChangeSetup(virNetworkObjPtr network, = unsigned int flags) return ret; } =20 -void virNetworkRemoveInactive(virNetworkObjListPtr nets, - virNetworkObjPtr net) + +void +virNetworkRemoveInactive(virNetworkObjListPtr nets, + virNetworkObjPtr net) { char uuidstr[VIR_UUID_STRING_BUFLEN]; =20 @@ -572,6 +595,7 @@ void virNetworkRemoveInactive(virNetworkObjListPtr nets, virObjectUnref(net); } =20 + static char * virNetworkObjFormat(virNetworkObjPtr net, unsigned int flags) @@ -611,8 +635,10 @@ virNetworkObjFormat(virNetworkObjPtr net, return NULL; } =20 -int virNetworkSaveStatus(const char *statusDir, - virNetworkObjPtr network) + +int +virNetworkSaveStatus(const char *statusDir, + virNetworkObjPtr network) { int ret =3D -1; int flags =3D 0; @@ -630,6 +656,7 @@ int virNetworkSaveStatus(const char *statusDir, return ret; } =20 + virNetworkObjPtr virNetworkLoadState(virNetworkObjListPtr nets, const char *stateDir, @@ -754,10 +781,12 @@ virNetworkLoadState(virNetworkObjListPtr nets, goto cleanup; } =20 -virNetworkObjPtr virNetworkLoadConfig(virNetworkObjListPtr nets, - const char *configDir, - const char *autostartDir, - const char *name) + +virNetworkObjPtr +virNetworkLoadConfig(virNetworkObjListPtr nets, + const char *configDir, + const char *autostartDir, + const char *name) { char *configFile =3D NULL, *autostartLink =3D NULL; virNetworkDefPtr def =3D NULL; @@ -843,9 +872,10 @@ virNetworkLoadAllState(virNetworkObjListPtr nets, } =20 =20 -int virNetworkLoadAllConfigs(virNetworkObjListPtr nets, - const char *configDir, - const char *autostartDir) +int +virNetworkLoadAllConfigs(virNetworkObjListPtr nets, + const char *configDir, + const char *autostartDir) { DIR *dir; struct dirent *entry; @@ -874,9 +904,11 @@ int virNetworkLoadAllConfigs(virNetworkObjListPtr nets, return ret; } =20 -int virNetworkDeleteConfig(const char *configDir, - const char *autostartDir, - virNetworkObjPtr net) + +int +virNetworkDeleteConfig(const char *configDir, + const char *autostartDir, + virNetworkObjPtr net) { char *configFile =3D NULL; char *autostartLink =3D NULL; @@ -906,6 +938,7 @@ int virNetworkDeleteConfig(const char *configDir, return ret; } =20 + struct virNetworkBridgeInUseHelperData { const char *bridge; const char *skipname; @@ -936,9 +969,11 @@ virNetworkBridgeInUseHelper(const void *payload, return ret; } =20 -int virNetworkBridgeInUse(virNetworkObjListPtr nets, - const char *bridge, - const char *skipname) + +int +virNetworkBridgeInUse(virNetworkObjListPtr nets, + const char *bridge, + const char *skipname) { virNetworkObjPtr obj; struct virNetworkBridgeInUseHelperData data =3D {bridge, skipname}; @@ -1037,6 +1072,7 @@ virNetworkObjUpdate(virNetworkObjPtr network, return ret; } =20 + #define MATCH(FLAG) (flags & (FLAG)) static bool virNetworkMatch(virNetworkObjPtr netobj, @@ -1070,6 +1106,7 @@ virNetworkMatch(virNetworkObjPtr netobj, } #undef MATCH =20 + struct virNetworkObjListData { virConnectPtr conn; virNetworkPtr *nets; @@ -1117,6 +1154,7 @@ virNetworkObjListPopulate(void *payload, return 0; } =20 + int virNetworkObjListExport(virConnectPtr conn, virNetworkObjListPtr netobjs, @@ -1153,6 +1191,7 @@ virNetworkObjListExport(virConnectPtr conn, return ret; } =20 + struct virNetworkObjListForEachHelperData { virNetworkObjListIterator callback; void *opaque; @@ -1171,6 +1210,7 @@ virNetworkObjListForEachHelper(void *payload, return 0; } =20 + /** * virNetworkObjListForEach: * @nets: a list of network objects @@ -1196,6 +1236,7 @@ virNetworkObjListForEach(virNetworkObjListPtr nets, return data.ret; } =20 + struct virNetworkObjListGetHelperData { virConnectPtr conn; virNetworkObjListFilter filter; @@ -1242,6 +1283,7 @@ virNetworkObjListGetHelper(void *payload, return 0; } =20 + int virNetworkObjListGetNames(virNetworkObjListPtr nets, bool active, @@ -1271,6 +1313,7 @@ virNetworkObjListGetNames(virNetworkObjListPtr nets, return ret; } =20 + int virNetworkObjListNumOfNetworks(virNetworkObjListPtr nets, bool active, @@ -1287,6 +1330,7 @@ virNetworkObjListNumOfNetworks(virNetworkObjListPtr n= ets, return data.got; } =20 + struct virNetworkObjListPruneHelperData { unsigned int flags; }; @@ -1306,6 +1350,7 @@ virNetworkObjListPruneHelper(const void *payload, return want; } =20 + /** * virNetworkObjListPrune: * @nets: a list of network objects --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list