From nobody Sun Feb 8 19:55:03 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.24 as permitted sender) client-ip=209.132.183.24; envelope-from=libvir-list-bounces@redhat.com; helo=mx3-phx2.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.24 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by mx.zohomail.com with SMTPS id 1488922775638649.5303796818461; Tue, 7 Mar 2017 13:39:35 -0800 (PST) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v27La2ar003874; Tue, 7 Mar 2017 16:36:02 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v27La17t013298 for ; Tue, 7 Mar 2017 16:36:01 -0500 Received: from localhost.localdomain.com (ovpn-117-9.phx2.redhat.com [10.3.117.9]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v27La0IF001585 for ; Tue, 7 Mar 2017 16:36:01 -0500 From: John Ferlan To: libvir-list@redhat.com Date: Tue, 7 Mar 2017 16:35:55 -0500 Message-Id: <20170307213557.10424-3-jferlan@redhat.com> In-Reply-To: <20170307213557.10424-1-jferlan@redhat.com> References: <20170307213557.10424-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/4] conf: Adjust coding style for storage 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/storage_conf.c | 34 +++++++++++++++++++++++++++++++--- src/conf/virstorageobj.c | 17 +++++++++++++++++ 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 58682d1..3dce6e6 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -145,6 +145,7 @@ struct _virStoragePoolTypeInfo { virStorageVolOptions volOptions; }; =20 + static int virStorageVolumeFormatFromString(const char *format) { @@ -154,6 +155,7 @@ virStorageVolumeFormatFromString(const char *format) return ret; } =20 + static virStoragePoolTypeInfo poolTypeInfo[] =3D { {.poolType =3D VIR_STORAGE_POOL_LOGICAL, .poolOptions =3D { @@ -303,6 +305,7 @@ virStoragePoolTypeInfoLookup(int type) return NULL; } =20 + static virStoragePoolOptionsPtr virStoragePoolOptionsForPoolType(int type) { @@ -312,6 +315,7 @@ virStoragePoolOptionsForPoolType(int type) return &backend->poolOptions; } =20 + static virStorageVolOptionsPtr virStorageVolOptionsForPoolType(int type) { @@ -341,6 +345,7 @@ virStorageVolDefFree(virStorageVolDefPtr def) VIR_FREE(def); } =20 + static void virStoragePoolSourceAdapterClear(virStoragePoolSourceAdapterPtr adapter) { @@ -357,6 +362,7 @@ virStoragePoolSourceAdapterClear(virStoragePoolSourceAd= apterPtr adapter) } } =20 + void virStoragePoolSourceDeviceClear(virStoragePoolSourceDevicePtr dev) { @@ -364,6 +370,7 @@ virStoragePoolSourceDeviceClear(virStoragePoolSourceDev= icePtr dev) VIR_FREE(dev->path); } =20 + void virStoragePoolSourceClear(virStoragePoolSourcePtr source) { @@ -388,6 +395,7 @@ virStoragePoolSourceClear(virStoragePoolSourcePtr sourc= e) VIR_FREE(source->product); } =20 + void virStoragePoolSourceFree(virStoragePoolSourcePtr source) { @@ -395,6 +403,7 @@ virStoragePoolSourceFree(virStoragePoolSourcePtr source) VIR_FREE(source); } =20 + void virStoragePoolDefFree(virStoragePoolDefPtr def) { @@ -666,6 +675,7 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, return ret; } =20 + virStoragePoolSourcePtr virStoragePoolDefParseSourceString(const char *srcSpec, int pool_type) @@ -703,6 +713,7 @@ virStoragePoolDefParseSourceString(const char *srcSpec, return ret; } =20 + static int virStorageDefParsePerms(xmlXPathContextPtr ctxt, virStoragePermsPtr perms, @@ -780,6 +791,7 @@ virStorageDefParsePerms(xmlXPathContextPtr ctxt, return ret; } =20 + virStoragePoolDefPtr virStoragePoolDefParseXML(xmlXPathContextPtr ctxt) { @@ -957,6 +969,7 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt) goto cleanup; } =20 + virStoragePoolDefPtr virStoragePoolDefParseNode(xmlDocPtr xml, xmlNodePtr root) @@ -985,6 +998,7 @@ virStoragePoolDefParseNode(xmlDocPtr xml, return def; } =20 + static virStoragePoolDefPtr virStoragePoolDefParse(const char *xmlStr, const char *filename) @@ -1000,18 +1014,21 @@ virStoragePoolDefParse(const char *xmlStr, return ret; } =20 + virStoragePoolDefPtr virStoragePoolDefParseString(const char *xmlStr) { return virStoragePoolDefParse(xmlStr, NULL); } =20 + virStoragePoolDefPtr virStoragePoolDefParseFile(const char *filename) { return virStoragePoolDefParse(NULL, filename); } =20 + static int virStoragePoolSourceFormat(virBufferPtr buf, virStoragePoolOptionsPtr options, @@ -1219,6 +1236,7 @@ virStoragePoolDefFormatBuf(virBufferPtr buf, return 0; } =20 + char * virStoragePoolDefFormat(virStoragePoolDefPtr def) { @@ -1256,6 +1274,7 @@ virStorageSize(const char *unit, return 0; } =20 + static virStorageVolDefPtr virStorageVolDefParseXML(virStoragePoolDefPtr pool, xmlXPathContextPtr ctxt, @@ -1431,6 +1450,7 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, goto cleanup; } =20 + virStorageVolDefPtr virStorageVolDefParseNode(virStoragePoolDefPtr pool, xmlDocPtr xml, @@ -1461,6 +1481,7 @@ virStorageVolDefParseNode(virStoragePoolDefPtr pool, return def; } =20 + static virStorageVolDefPtr virStorageVolDefParse(virStoragePoolDefPtr pool, const char *xmlStr, @@ -1478,6 +1499,7 @@ virStorageVolDefParse(virStoragePoolDefPtr pool, return ret; } =20 + virStorageVolDefPtr virStorageVolDefParseString(virStoragePoolDefPtr pool, const char *xmlStr, @@ -1486,6 +1508,7 @@ virStorageVolDefParseString(virStoragePoolDefPtr pool, return virStorageVolDefParse(pool, xmlStr, NULL, flags); } =20 + virStorageVolDefPtr virStorageVolDefParseFile(virStoragePoolDefPtr pool, const char *filename, @@ -1494,6 +1517,7 @@ virStorageVolDefParseFile(virStoragePoolDefPtr pool, return virStorageVolDefParse(pool, NULL, filename, flags); } =20 + static void virStorageVolTimestampFormat(virBufferPtr buf, const char *name, struct timespec *ts) @@ -1507,6 +1531,7 @@ virStorageVolTimestampFormat(virBufferPtr buf, const = char *name, virBufferAsprintf(buf, "\n", name); } =20 + static int virStorageVolTargetDefFormat(virStorageVolOptionsPtr options, virBufferPtr buf, @@ -1598,6 +1623,7 @@ virStorageVolTargetDefFormat(virStorageVolOptionsPtr = options, return 0; } =20 + char * virStorageVolDefFormat(virStoragePoolDefPtr pool, virStorageVolDefPtr def) @@ -1680,9 +1706,10 @@ virStorageVolDefFormat(virStoragePoolDefPtr pool, } =20 =20 -static int virStoragePoolSaveXML(const char *path, - virStoragePoolDefPtr def, - const char *xml) +static int +virStoragePoolSaveXML(const char *path, + virStoragePoolDefPtr def, + const char *xml) { char uuidstr[VIR_UUID_STRING_BUFLEN]; int ret =3D -1; @@ -1767,6 +1794,7 @@ virStoragePoolSourceListNewSource(virStoragePoolSourc= eListPtr list) return source; } =20 + char * virStoragePoolSourceListFormat(virStoragePoolSourceListPtr def) { diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 5c0f827..12108d8 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -56,6 +56,7 @@ virStoragePoolObjFree(virStoragePoolObjPtr obj) VIR_FREE(obj); } =20 + void virStoragePoolObjListFree(virStoragePoolObjListPtr pools) { @@ -66,6 +67,7 @@ virStoragePoolObjListFree(virStoragePoolObjListPtr pools) pools->count =3D 0; } =20 + void virStoragePoolObjRemove(virStoragePoolObjListPtr pools, virStoragePoolObjPtr pool) @@ -104,6 +106,7 @@ virStoragePoolObjFindByUUID(virStoragePoolObjListPtr po= ols, return NULL; } =20 + virStoragePoolObjPtr virStoragePoolObjFindByName(virStoragePoolObjListPtr pools, const char *name) @@ -120,6 +123,7 @@ virStoragePoolObjFindByName(virStoragePoolObjListPtr po= ols, return NULL; } =20 + virStoragePoolObjPtr virStoragePoolSourceFindDuplicateDevices(virStoragePoolObjPtr pool, virStoragePoolDefPtr def) @@ -136,6 +140,7 @@ virStoragePoolSourceFindDuplicateDevices(virStoragePool= ObjPtr pool, return NULL; } =20 + void virStoragePoolObjClearVols(virStoragePoolObjPtr pool) { @@ -147,6 +152,7 @@ virStoragePoolObjClearVols(virStoragePoolObjPtr pool) pool->volumes.count =3D 0; } =20 + virStorageVolDefPtr virStorageVolDefFindByKey(virStoragePoolObjPtr pool, const char *key) @@ -160,6 +166,7 @@ virStorageVolDefFindByKey(virStoragePoolObjPtr pool, return NULL; } =20 + virStorageVolDefPtr virStorageVolDefFindByPath(virStoragePoolObjPtr pool, const char *path) @@ -173,6 +180,7 @@ virStorageVolDefFindByPath(virStoragePoolObjPtr pool, return NULL; } =20 + virStorageVolDefPtr virStorageVolDefFindByName(virStoragePoolObjPtr pool, const char *name) @@ -186,6 +194,7 @@ virStorageVolDefFindByName(virStoragePoolObjPtr pool, return NULL; } =20 + virStoragePoolObjPtr virStoragePoolObjAssignDef(virStoragePoolObjListPtr pools, virStoragePoolDefPtr def) @@ -225,6 +234,7 @@ virStoragePoolObjAssignDef(virStoragePoolObjListPtr poo= ls, return pool; } =20 + static virStoragePoolObjPtr virStoragePoolObjLoad(virStoragePoolObjListPtr pools, const char *file, @@ -428,6 +438,7 @@ virStoragePoolObjSaveDef(virStorageDriverStatePtr drive= r, return virStoragePoolSaveConfig(pool->configFile, def); } =20 + int virStoragePoolObjDeleteDef(virStoragePoolObjPtr pool) { @@ -637,6 +648,7 @@ matchFCHostToSCSIHost(virConnectPtr conn, return ret; } =20 + static bool matchSCSIAdapterParent(virStoragePoolObjPtr pool, virStoragePoolDefPtr def) @@ -659,6 +671,7 @@ matchSCSIAdapterParent(virStoragePoolObjPtr pool, return false; } =20 + static bool virStoragePoolSourceMatchSingleHost(virStoragePoolSourcePtr poolsrc, virStoragePoolSourcePtr defsrc) @@ -840,18 +853,21 @@ virStoragePoolSourceFindDuplicate(virConnectPtr conn, return ret; } =20 + void virStoragePoolObjLock(virStoragePoolObjPtr obj) { virMutexLock(&obj->lock); } =20 + void virStoragePoolObjUnlock(virStoragePoolObjPtr obj) { virMutexUnlock(&obj->lock); } =20 + #define MATCH(FLAG) (flags & (FLAG)) static bool virStoragePoolMatch(virStoragePoolObjPtr poolobj, @@ -912,6 +928,7 @@ virStoragePoolMatch(virStoragePoolObjPtr poolobj, } #undef MATCH =20 + int virStoragePoolObjListExport(virConnectPtr conn, virStoragePoolObjList poolobjs, --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list