From nobody Sun Feb 8 23:04:11 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 1489669689412330.861479438203; Thu, 16 Mar 2017 06:08:09 -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 89A17347A42; Thu, 16 Mar 2017 13:08:05 +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 5D510627DE; Thu, 16 Mar 2017 13:08:05 +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 0509D1853D07; Thu, 16 Mar 2017 13:08:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2GD7s8I018777 for ; Thu, 16 Mar 2017 09:07:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id C1CE617A79; Thu, 16 Mar 2017 13:07:54 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-76.phx2.redhat.com [10.3.116.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7FC4118B3D for ; Thu, 16 Mar 2017 13:07:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 89A17347A42 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.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 89A17347A42 From: John Ferlan To: libvir-list@redhat.com Date: Thu, 16 Mar 2017 09:07:45 -0400 Message-Id: <20170316130747.25288-3-jferlan@redhat.com> In-Reply-To: <20170316130747.25288-1-jferlan@redhat.com> References: <20170316130747.25288-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [REPOST 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-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.29]); Thu, 16 Mar 2017 13:08:06 +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/storage_conf.c | 31 ++++++++++++++++++++++++++++--- src/conf/virstorageobj.c | 16 ++++++++++++++++ 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 32fc02a..6b34cea 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -142,6 +142,7 @@ struct _virStoragePoolTypeInfo { virStorageVolOptions volOptions; }; =20 + static int virStorageVolumeFormatFromString(const char *format) { @@ -151,6 +152,7 @@ virStorageVolumeFormatFromString(const char *format) return ret; } =20 + static virStoragePoolTypeInfo poolTypeInfo[] =3D { {.poolType =3D VIR_STORAGE_POOL_LOGICAL, .poolOptions =3D { @@ -300,6 +302,7 @@ virStoragePoolTypeInfoLookup(int type) return NULL; } =20 + static virStoragePoolOptionsPtr virStoragePoolOptionsForPoolType(int type) { @@ -309,6 +312,7 @@ virStoragePoolOptionsForPoolType(int type) return &backend->poolOptions; } =20 + static virStorageVolOptionsPtr virStorageVolOptionsForPoolType(int type) { @@ -338,6 +342,7 @@ virStorageVolDefFree(virStorageVolDefPtr def) VIR_FREE(def); } =20 + void virStoragePoolSourceDeviceClear(virStoragePoolSourceDevicePtr dev) { @@ -345,6 +350,7 @@ virStoragePoolSourceDeviceClear(virStoragePoolSourceDev= icePtr dev) VIR_FREE(dev->path); } =20 + void virStoragePoolSourceClear(virStoragePoolSourcePtr source) { @@ -369,6 +375,7 @@ virStoragePoolSourceClear(virStoragePoolSourcePtr sourc= e) VIR_FREE(source->product); } =20 + void virStoragePoolSourceFree(virStoragePoolSourcePtr source) { @@ -376,6 +383,7 @@ virStoragePoolSourceFree(virStoragePoolSourcePtr source) VIR_FREE(source); } =20 + void virStoragePoolDefFree(virStoragePoolDefPtr def) { @@ -544,6 +552,7 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, return ret; } =20 + virStoragePoolSourcePtr virStoragePoolDefParseSourceString(const char *srcSpec, int pool_type) @@ -581,6 +590,7 @@ virStoragePoolDefParseSourceString(const char *srcSpec, return ret; } =20 + static int virStorageDefParsePerms(xmlXPathContextPtr ctxt, virStoragePermsPtr perms, @@ -800,6 +810,7 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt) goto cleanup; } =20 + virStoragePoolDefPtr virStoragePoolDefParseNode(xmlDocPtr xml, xmlNodePtr root) @@ -828,6 +839,7 @@ virStoragePoolDefParseNode(xmlDocPtr xml, return def; } =20 + static virStoragePoolDefPtr virStoragePoolDefParse(const char *xmlStr, const char *filename) @@ -843,12 +855,14 @@ virStoragePoolDefParse(const char *xmlStr, return ret; } =20 + virStoragePoolDefPtr virStoragePoolDefParseString(const char *xmlStr) { return virStoragePoolDefParse(xmlStr, NULL); } =20 + virStoragePoolDefPtr virStoragePoolDefParseFile(const char *filename) { @@ -1024,6 +1038,7 @@ virStoragePoolDefFormatBuf(virBufferPtr buf, return 0; } =20 + char * virStoragePoolDefFormat(virStoragePoolDefPtr def) { @@ -1061,6 +1076,7 @@ virStorageSize(const char *unit, return 0; } =20 + static virStorageVolDefPtr virStorageVolDefParseXML(virStoragePoolDefPtr pool, xmlXPathContextPtr ctxt, @@ -1236,6 +1252,7 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, goto cleanup; } =20 + virStorageVolDefPtr virStorageVolDefParseNode(virStoragePoolDefPtr pool, xmlDocPtr xml, @@ -1266,6 +1283,7 @@ virStorageVolDefParseNode(virStoragePoolDefPtr pool, return def; } =20 + static virStorageVolDefPtr virStorageVolDefParse(virStoragePoolDefPtr pool, const char *xmlStr, @@ -1283,6 +1301,7 @@ virStorageVolDefParse(virStoragePoolDefPtr pool, return ret; } =20 + virStorageVolDefPtr virStorageVolDefParseString(virStoragePoolDefPtr pool, const char *xmlStr, @@ -1291,6 +1310,7 @@ virStorageVolDefParseString(virStoragePoolDefPtr pool, return virStorageVolDefParse(pool, xmlStr, NULL, flags); } =20 + virStorageVolDefPtr virStorageVolDefParseFile(virStoragePoolDefPtr pool, const char *filename, @@ -1299,6 +1319,7 @@ virStorageVolDefParseFile(virStoragePoolDefPtr pool, return virStorageVolDefParse(pool, NULL, filename, flags); } =20 + static void virStorageVolTimestampFormat(virBufferPtr buf, const char *name, struct timespec *ts) @@ -1312,6 +1333,7 @@ virStorageVolTimestampFormat(virBufferPtr buf, const = char *name, virBufferAsprintf(buf, "\n", name); } =20 + static int virStorageVolTargetDefFormat(virStorageVolOptionsPtr options, virBufferPtr buf, @@ -1403,6 +1425,7 @@ virStorageVolTargetDefFormat(virStorageVolOptionsPtr = options, return 0; } =20 + char * virStorageVolDefFormat(virStoragePoolDefPtr pool, virStorageVolDefPtr def) @@ -1485,9 +1508,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; @@ -1572,6 +1596,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 5f2f947..1474838 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) { @@ -654,6 +665,7 @@ matchSCSIAdapterParent(virStorageAdapterSCSIHostPtr poo= l_scsi_host, return false; } =20 + static bool virStoragePoolSourceMatchSingleHost(virStoragePoolSourcePtr poolsrc, virStoragePoolSourcePtr defsrc) @@ -848,18 +860,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, @@ -924,6 +939,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