10:30 a.m.
Fix some spacing/formatting in the storage pool/vol test driver code.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/test/test_driver.c | 37 +++++++++++++++++++++++++++++++------
1 file changed, 31 insertions(+), 6 deletions(-)
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 2db3f7d..548f318 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -1035,6 +1035,7 @@ testParseInterfaces(testDriverPtr privconn,
return ret;
}
+
static int
testOpenVolumesForPool(const char *file,
xmlXPathContextPtr ctxt,
@@ -1091,6 +1092,7 @@ testOpenVolumesForPool(const char *file,
return ret;
}
+
static int
testParseStorage(testDriverPtr privconn,
const char *file,
@@ -1143,6 +1145,7 @@ testParseStorage(testDriverPtr privconn,
return ret;
}
+
static int
testParseNodedevs(testDriverPtr privconn,
const char *file,
@@ -3996,8 +3999,8 @@ testInterfaceDestroy(virInterfacePtr iface,
* Storage Driver routines
*/
-
-static int testStoragePoolObjSetDefaults(virStoragePoolObjPtr pool)
+static int
+testStoragePoolObjSetDefaults(virStoragePoolObjPtr pool)
{
pool->def->capacity = defaultPoolCap;
@@ -4069,6 +4072,7 @@ testStoragePoolLookupByUUID(virConnectPtr conn,
return ret;
}
+
static virStoragePoolPtr
testStoragePoolLookupByName(virConnectPtr conn,
const char *name)
@@ -4089,6 +4093,7 @@ testStoragePoolLookupByName(virConnectPtr conn,
return ret;
}
+
static virStoragePoolPtr
testStoragePoolLookupByVolume(virStorageVolPtr vol)
{
@@ -4159,6 +4164,7 @@ testConnectListDefinedStoragePools(virConnectPtr conn,
return n;
}
+
static int
testConnectListAllStoragePools(virConnectPtr conn,
virStoragePoolPtr **pools,
@@ -4177,7 +4183,9 @@ testConnectListAllStoragePools(virConnectPtr conn,
return ret;
}
-static int testStoragePoolIsActive(virStoragePoolPtr pool)
+
+static int
+testStoragePoolIsActive(virStoragePoolPtr pool)
{
testDriverPtr privconn = pool->conn->privateData;
virStoragePoolObjPtr obj;
@@ -4194,7 +4202,9 @@ static int testStoragePoolIsActive(virStoragePoolPtr pool)
return ret;
}
-static int testStoragePoolIsPersistent(virStoragePoolPtr pool)
+
+static int
+testStoragePoolIsPersistent(virStoragePoolPtr pool)
{
testDriverPtr privconn = pool->conn->privateData;
virStoragePoolObjPtr obj;
@@ -4212,7 +4222,6 @@ static int testStoragePoolIsPersistent(virStoragePoolPtr pool)
}
-
static int
testStoragePoolCreate(virStoragePoolPtr pool,
unsigned int flags)
@@ -4247,6 +4256,7 @@ testStoragePoolCreate(virStoragePoolPtr pool,
return ret;
}
+
static char *
testConnectFindStoragePoolSources(virConnectPtr conn ATTRIBUTE_UNUSED,
const char *type,
@@ -4401,6 +4411,7 @@ testStoragePoolCreateXML(virConnectPtr conn,
return ret;
}
+
static virStoragePoolPtr
testStoragePoolDefineXML(virConnectPtr conn,
const char *xml,
@@ -4448,6 +4459,7 @@ testStoragePoolDefineXML(virConnectPtr conn,
return ret;
}
+
static int
testStoragePoolUndefine(virStoragePoolPtr pool)
{
@@ -4480,6 +4492,7 @@ testStoragePoolUndefine(virStoragePoolPtr pool)
return ret;
}
+
static int
testStoragePoolBuild(virStoragePoolPtr pool,
unsigned int flags)
@@ -4677,6 +4690,7 @@ testStoragePoolGetInfo(virStoragePoolPtr pool,
return ret;
}
+
static char *
testStoragePoolGetXMLDesc(virStoragePoolPtr pool,
unsigned int flags)
@@ -4698,6 +4712,7 @@ testStoragePoolGetXMLDesc(virStoragePoolPtr pool,
return ret;
}
+
static int
testStoragePoolGetAutostart(virStoragePoolPtr pool,
int *autostart)
@@ -4722,6 +4737,7 @@ testStoragePoolGetAutostart(virStoragePoolPtr pool,
return ret;
}
+
static int
testStoragePoolSetAutostart(virStoragePoolPtr pool,
int autostart)
@@ -4832,6 +4848,7 @@ testStoragePoolListAllVolumes(virStoragePoolPtr obj,
return ret;
}
+
static virStorageVolPtr
testStorageVolLookupByName(virStoragePoolPtr pool,
const char *name ATTRIBUTE_UNUSED)
@@ -4905,6 +4922,7 @@ testStorageVolLookupByKey(virConnectPtr conn,
return ret;
}
+
static virStorageVolPtr
testStorageVolLookupByPath(virConnectPtr conn,
const char *path)
@@ -4941,6 +4959,7 @@ testStorageVolLookupByPath(virConnectPtr conn,
return ret;
}
+
static virStorageVolPtr
testStorageVolCreateXML(virStoragePoolPtr pool,
const char *xmldesc,
@@ -5007,6 +5026,7 @@ testStorageVolCreateXML(virStoragePoolPtr pool,
return ret;
}
+
static virStorageVolPtr
testStorageVolCreateXMLFrom(virStoragePoolPtr pool,
const char *xmldesc,
@@ -5084,6 +5104,7 @@ testStorageVolCreateXMLFrom(virStoragePoolPtr pool,
return ret;
}
+
static int
testStorageVolDelete(virStorageVolPtr vol,
unsigned int flags)
@@ -5136,7 +5157,8 @@ testStorageVolDelete(virStorageVolPtr vol,
}
-static int testStorageVolumeTypeForPool(int pooltype)
+static int
+testStorageVolumeTypeForPool(int pooltype)
{
switch (pooltype) {
@@ -5149,6 +5171,7 @@ static int testStorageVolumeTypeForPool(int pooltype)
}
}
+
static int
testStorageVolGetInfo(virStorageVolPtr vol,
virStorageVolInfoPtr info)
@@ -5188,6 +5211,7 @@ testStorageVolGetInfo(virStorageVolPtr vol,
return ret;
}
+
static char *
testStorageVolGetXMLDesc(virStorageVolPtr vol,
unsigned int flags)
@@ -5225,6 +5249,7 @@ testStorageVolGetXMLDesc(virStorageVolPtr vol,
return ret;
}
+
static char *
testStorageVolGetPath(virStorageVolPtr vol)
{
--
2.9.3