From nobody Wed Apr 1 08:42:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.25 as permitted sender) client-ip=209.132.183.25; envelope-from=libvir-list-bounces@redhat.com; helo=mx4-phx2.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.25 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by mx.zohomail.com with SMTPS id 1488818397194851.8037769465018; Mon, 6 Mar 2017 08:39:57 -0800 (PST) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v26GabmW024134; Mon, 6 Mar 2017 11:36:37 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v26GaI1F019686 for ; Mon, 6 Mar 2017 11:36:18 -0500 Received: from localhost.localdomain.com (ovpn-117-9.phx2.redhat.com [10.3.117.9]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v26GaGoU010285 for ; Mon, 6 Mar 2017 11:36:18 -0500 From: John Ferlan To: libvir-list@redhat.com Date: Mon, 6 Mar 2017 11:36:10 -0500 Message-Id: <20170306163612.6514-5-jferlan@redhat.com> In-Reply-To: <20170306163612.6514-1-jferlan@redhat.com> References: <20170306163612.6514-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 4/6] conf: Adjust coding style for nwfilter 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-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/nwfilter_conf.c | 128 ++++++++++++++++++++++++++++++++----------= ---- src/conf/virnwfilterobj.c | 14 +++-- 2 files changed, 99 insertions(+), 43 deletions(-) diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index c4e8ec1..b69d9db 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -139,6 +139,7 @@ static const struct int_map chain_priorities[] =3D { INTMAP_ENTRY_LAST, }; =20 + /* * only one filter update allowed */ @@ -151,12 +152,14 @@ virNWFilterReadLockFilterUpdates(void) virRWLockRead(&updateLock); } =20 + void virNWFilterWriteLockFilterUpdates(void) { virRWLockWrite(&updateLock); } =20 + void virNWFilterUnlockFilterUpdates(void) { @@ -164,7 +167,6 @@ virNWFilterUnlockFilterUpdates(void) } =20 =20 - /* * attribute names for the rules XML */ @@ -234,7 +236,9 @@ static const char ipsetflags_str[] =3D "ipsetflags"; * lookup a map entry given the integer. */ static int -intMapGetByInt(const struct int_map *intmap, int32_t attr, const char **re= s) +intMapGetByInt(const struct int_map *intmap, + int32_t attr, + const char **res) { size_t i =3D 0; bool found =3D false; @@ -263,7 +267,9 @@ intMapGetByInt(const struct int_map *intmap, int32_t at= tr, const char **res) * value. Returns 0 if entry was found with result returned, -1 otherwise. */ static int -intMapGetByString(const struct int_map *intmap, const char *str, int casec= mp, +intMapGetByString(const struct int_map *intmap, + const char *str, + int casecmp, int32_t *result) { size_t i =3D 0; @@ -428,7 +434,8 @@ static const struct int_map macProtoMap[] =3D { =20 =20 static bool -checkMacProtocolID(enum attrDatatype datatype, union data *value, +checkMacProtocolID(enum attrDatatype datatype, + union data *value, virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, nwItemDesc *item ATTRIBUTE_UNUSED) { @@ -478,7 +485,8 @@ macProtocolIDFormatter(virBufferPtr buf, =20 =20 static bool -checkVlanVlanID(enum attrDatatype datatype, union data *value, +checkVlanVlanID(enum attrDatatype datatype, + union data *value, virNWFilterRuleDefPtr nwf, nwItemDesc *item ATTRIBUTE_UNUSED) { @@ -497,8 +505,10 @@ checkVlanVlanID(enum attrDatatype datatype, union data= *value, return false; } =20 + static bool -checkVlanProtocolID(enum attrDatatype datatype, union data *value, +checkVlanProtocolID(enum attrDatatype datatype, + union data *value, virNWFilterRuleDefPtr nwf, nwItemDesc *item ATTRIBUTE_UNUSED) { @@ -524,6 +534,7 @@ checkVlanProtocolID(enum attrDatatype datatype, union d= ata *value, return false; } =20 + static bool vlanProtocolIDFormatter(virBufferPtr buf, virNWFilterRuleDefPtr nwf, @@ -545,12 +556,14 @@ vlanProtocolIDFormatter(virBufferPtr buf, return true; } =20 + /* generic function to check for a valid (ipv4,ipv6, mac) mask * A mask is valid of there is a sequence of 1's followed by a sequence * of 0s or only 1s or only 0s */ static bool -checkValidMask(unsigned char *data, int len) +checkValidMask(unsigned char *data, + int len) { uint32_t idx =3D 0; uint8_t mask =3D 0x80; @@ -712,7 +725,8 @@ formatIPProtocolID(virBufferPtr buf, =20 =20 static bool -dscpValidator(enum attrDatatype datatype, union data *val, +dscpValidator(enum attrDatatype datatype, + union data *val, virNWFilterRuleDefPtr nwf, nwItemDesc *item ATTRIBUTE_UNUSED) { @@ -738,7 +752,9 @@ static const struct int_map stateMatchMap[] =3D { =20 static int parseStringItems(const struct int_map *int_map, - const char *input, int32_t *flags, char sep) + const char *input, + int32_t *flags, + char sep) { int rc =3D 0; size_t i, j; @@ -770,8 +786,10 @@ parseStringItems(const struct int_map *int_map, =20 =20 static int -printStringItems(virBufferPtr buf, const struct int_map *int_map, - int32_t flags, const char *sep) +printStringItems(virBufferPtr buf, + const struct int_map *int_map, + int32_t flags, + const char *sep) { size_t i; unsigned int c =3D 0; @@ -799,7 +817,8 @@ printStringItems(virBufferPtr buf, const struct int_map= *int_map, =20 =20 static int -parseStateMatch(const char *statematch, int32_t *flags) +parseStateMatch(const char *statematch, + int32_t *flags) { int rc =3D parseStringItems(stateMatchMap, statematch, flags, ','); =20 @@ -811,8 +830,10 @@ parseStateMatch(const char *statematch, int32_t *flags) =20 =20 void -virNWFilterPrintStateMatchFlags(virBufferPtr buf, const char *prefix, - int32_t flags, bool disp_none) +virNWFilterPrintStateMatchFlags(virBufferPtr buf, + const char *prefix, + int32_t flags, + bool disp_none) { if (!disp_none && (flags & RULE_FLAG_STATE_NONE)) return; @@ -824,7 +845,8 @@ virNWFilterPrintStateMatchFlags(virBufferPtr buf, const= char *prefix, =20 =20 static bool -stateValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, union data *va= l, +stateValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, + union data *val, virNWFilterRuleDefPtr nwf, nwItemDesc *item) { @@ -854,7 +876,6 @@ stateFormatter(virBufferPtr buf, } =20 =20 - static const struct int_map tcpFlags[] =3D { INTMAP_ENTRY(0x1, "FIN"), INTMAP_ENTRY(0x2, "SYN"), @@ -869,7 +890,8 @@ static const struct int_map tcpFlags[] =3D { =20 =20 static bool -tcpFlagsValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, union data = *val, +tcpFlagsValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, + union data *val, virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, nwItemDesc *item) { @@ -900,7 +922,8 @@ tcpFlagsValidator(enum attrDatatype datatype ATTRIBUTE_= UNUSED, union data *val, =20 =20 static void -printTCPFlags(virBufferPtr buf, uint8_t flags) +printTCPFlags(virBufferPtr buf, + uint8_t flags) { if (flags =3D=3D 0) virBufferAddLit(buf, "NONE"); @@ -934,8 +957,10 @@ tcpFlagsFormatter(virBufferPtr buf, return true; } =20 + static bool -ipsetValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, union data *va= l, +ipsetValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, + union data *val, virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, nwItemDesc *item) { @@ -961,6 +986,7 @@ ipsetValidator(enum attrDatatype datatype ATTRIBUTE_UNU= SED, union data *val, return false; } =20 + static bool ipsetFormatter(virBufferPtr buf, virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, @@ -971,9 +997,12 @@ ipsetFormatter(virBufferPtr buf, return true; } =20 + static bool -ipsetFlagsValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, union dat= a *val, - virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, nwItemDesc= *item) +ipsetFlagsValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, + union data *val, + virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, + nwItemDesc *item) { const char *errmsg =3D NULL; size_t idx =3D 0; @@ -1007,6 +1036,7 @@ ipsetFlagsValidator(enum attrDatatype datatype ATTRIB= UTE_UNUSED, union data *val return false; } =20 + static bool ipsetFlagsFormatter(virBufferPtr buf, virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, @@ -1026,6 +1056,7 @@ ipsetFlagsFormatter(virBufferPtr buf, return true; } =20 + #define COMMON_MAC_PROPS(STRUCT) \ {\ .name =3D SRCMACADDR,\ @@ -1756,6 +1787,7 @@ static const virAttributes virAttr[] =3D { PROTOCOL_ENTRY_LAST }; =20 + static int virNWFilterRuleDetailsParse(xmlNodePtr node, virNWFilterRuleDefPtr nwf, @@ -2024,8 +2056,6 @@ virNWFilterRuleDetailsParse(xmlNodePtr node, } =20 =20 - - static virNWFilterIncludeDefPtr virNWFilterIncludeParse(xmlNodePtr cur) { @@ -2055,6 +2085,7 @@ virNWFilterIncludeParse(xmlNodePtr cur) goto cleanup; } =20 + static void virNWFilterRuleDefFixupIPSet(ipHdrDataDefPtr ipHdr) { @@ -2129,6 +2160,7 @@ virNWFilterRuleValidate(virNWFilterRuleDefPtr rule) return ret; } =20 + static void virNWFilterRuleDefFixup(virNWFilterRuleDefPtr rule) { @@ -2464,6 +2496,7 @@ virNWFilterRuleParse(xmlNodePtr node) goto cleanup; } =20 + static bool virNWFilterIsValidChainName(const char *chainname) { @@ -2484,6 +2517,7 @@ virNWFilterIsValidChainName(const char *chainname) return true; } =20 + /* * Test whether the name of the chain is supported. * It current has to have a prefix of either one of the strings found in @@ -2541,6 +2575,7 @@ virNWFilterIsAllowedChain(const char *chainname) return NULL; } =20 + static virNWFilterDefPtr virNWFilterDefParseXML(xmlXPathContextPtr ctxt) { @@ -2731,9 +2766,10 @@ virNWFilterDefParseFile(const char *filename) } =20 =20 -int virNWFilterSaveXML(const char *configDir, - virNWFilterDefPtr def, - const char *xml) +int +virNWFilterSaveXML(const char *configDir, + virNWFilterDefPtr def, + const char *xml) { char uuidstr[VIR_UUID_STRING_BUFLEN]; char *configFile =3D NULL; @@ -2760,8 +2796,9 @@ int virNWFilterSaveXML(const char *configDir, } =20 =20 -int virNWFilterSaveConfig(const char *configDir, - virNWFilterDefPtr def) +int +virNWFilterSaveConfig(const char *configDir, + virNWFilterDefPtr def) { int ret =3D -1; char *xml; @@ -2790,6 +2827,7 @@ virNWFilterRegisterCallbackDriver(virNWFilterCallback= DriverPtr cbd) callbackDrvArray[nCallbackDriver++] =3D cbd; } =20 + void virNWFilterUnRegisterCallbackDriver(virNWFilterCallbackDriverPtr cbd) { @@ -2806,6 +2844,7 @@ virNWFilterUnRegisterCallbackDriver(virNWFilterCallba= ckDriverPtr cbd) } } =20 + void virNWFilterCallbackDriversLock(void) { @@ -2815,6 +2854,7 @@ virNWFilterCallbackDriversLock(void) callbackDrvArray[i]->vmDriverLock(); } =20 + void virNWFilterCallbackDriversUnlock(void) { @@ -2850,6 +2890,7 @@ virNWFilterInstFiltersOnAllVMs(void) return 0; } =20 + int virNWFilterTriggerVMFilterRebuild(void) { @@ -2952,7 +2993,8 @@ virNWFilterDeleteDef(const char *configDir, =20 =20 static void -virNWIPAddressFormat(virBufferPtr buf, virSocketAddrPtr ipaddr) +virNWIPAddressFormat(virBufferPtr buf, + virSocketAddrPtr ipaddr) { char *output =3D virSocketAddrFormat(ipaddr); =20 @@ -3106,7 +3148,8 @@ virNWFilterRuleDefDetailsFormat(virBufferPtr buf, =20 =20 static int -virNWFilterRuleDefFormat(virBufferPtr buf, virNWFilterRuleDefPtr def) +virNWFilterRuleDefFormat(virBufferPtr buf, + virNWFilterRuleDefPtr def) { size_t i; bool subelement =3D false; @@ -3145,7 +3188,8 @@ virNWFilterRuleDefFormat(virBufferPtr buf, virNWFilte= rRuleDefPtr def) =20 =20 static int -virNWFilterEntryFormat(virBufferPtr buf, virNWFilterEntryPtr entry) +virNWFilterEntryFormat(virBufferPtr buf, + virNWFilterEntryPtr entry) { if (entry->rule) return virNWFilterRuleDefFormat(buf, entry->rule); @@ -3192,8 +3236,9 @@ virNWFilterDefFormat(const virNWFilterDef *def) } =20 =20 -char *virNWFilterConfigFile(const char *dir, - const char *name) +char * +virNWFilterConfigFile(const char *dir, + const char *name) { char *ret =3D NULL; =20 @@ -3202,8 +3247,9 @@ char *virNWFilterConfigFile(const char *dir, } =20 =20 -int virNWFilterConfLayerInit(virDomainObjListIterator domUpdateCB, - void *opaque) +int +virNWFilterConfLayerInit(virDomainObjListIterator domUpdateCB, + void *opaque) { if (initialized) return -1; @@ -3220,7 +3266,8 @@ int virNWFilterConfLayerInit(virDomainObjListIterator= domUpdateCB, } =20 =20 -void virNWFilterConfLayerShutdown(void) +void +virNWFilterConfLayerShutdown(void) { if (!initialized) return; @@ -3233,7 +3280,8 @@ void virNWFilterConfLayerShutdown(void) } =20 =20 -bool virNWFilterRuleIsProtocolIPv4(virNWFilterRuleDefPtr rule) +bool +virNWFilterRuleIsProtocolIPv4(virNWFilterRuleDefPtr rule) { if (rule->prtclType >=3D VIR_NWFILTER_RULE_PROTOCOL_TCP && rule->prtclType <=3D VIR_NWFILTER_RULE_PROTOCOL_ALL) @@ -3242,7 +3290,8 @@ bool virNWFilterRuleIsProtocolIPv4(virNWFilterRuleDef= Ptr rule) } =20 =20 -bool virNWFilterRuleIsProtocolIPv6(virNWFilterRuleDefPtr rule) +bool +virNWFilterRuleIsProtocolIPv6(virNWFilterRuleDefPtr rule) { if (rule->prtclType >=3D VIR_NWFILTER_RULE_PROTOCOL_TCPoIPV6 && rule->prtclType <=3D VIR_NWFILTER_RULE_PROTOCOL_ALLoIPV6) @@ -3251,7 +3300,8 @@ bool virNWFilterRuleIsProtocolIPv6(virNWFilterRuleDef= Ptr rule) } =20 =20 -bool virNWFilterRuleIsProtocolEthernet(virNWFilterRuleDefPtr rule) +bool +virNWFilterRuleIsProtocolEthernet(virNWFilterRuleDefPtr rule) { if (rule->prtclType <=3D VIR_NWFILTER_RULE_PROTOCOL_IPV6) return true; diff --git a/src/conf/virnwfilterobj.c b/src/conf/virnwfilterobj.c index 869365c..0d81912 100644 --- a/src/conf/virnwfilterobj.c +++ b/src/conf/virnwfilterobj.c @@ -100,7 +100,8 @@ virNWFilterObjFindByUUID(virNWFilterObjListPtr nwfilter= s, =20 =20 virNWFilterObjPtr -virNWFilterObjFindByName(virNWFilterObjListPtr nwfilters, const char *name) +virNWFilterObjFindByName(virNWFilterObjListPtr nwfilters, + const char *name) { size_t i; =20 @@ -187,8 +188,10 @@ virNWFilterTestUnassignDef(virNWFilterObjPtr nwfilter) return rc; } =20 + static bool -virNWFilterDefEqual(const virNWFilterDef *def1, virNWFilterDefPtr def2, +virNWFilterDefEqual(const virNWFilterDef *def1, + virNWFilterDefPtr def2, bool cmpUUIDs) { bool ret =3D false; @@ -217,6 +220,7 @@ virNWFilterDefEqual(const virNWFilterDef *def1, virNWFi= lterDefPtr def2, return ret; } =20 + virNWFilterObjPtr virNWFilterObjAssignDef(virNWFilterObjListPtr nwfilters, virNWFilterDefPtr def) @@ -370,13 +374,15 @@ virNWFilterLoadAllConfigs(virNWFilterObjListPtr nwfil= ters, } =20 =20 -void virNWFilterObjLock(virNWFilterObjPtr obj) +void +virNWFilterObjLock(virNWFilterObjPtr obj) { virMutexLock(&obj->lock); } =20 =20 -void virNWFilterObjUnlock(virNWFilterObjPtr obj) +void +virNWFilterObjUnlock(virNWFilterObjPtr obj) { virMutexUnlock(&obj->lock); } --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list