提交 b6d6635e 编写于 作者: M Martin Kletzander

Use K&R style for curly braces in src/storage/

Signed-off-by: NMartin Kletzander <mkletzan@redhat.com>
上级 b1d5f6c6
...@@ -330,7 +330,8 @@ virStorageBackendFileSystemNetFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSE ...@@ -330,7 +330,8 @@ virStorageBackendFileSystemNetFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSE
* Return 0 if not mounted, 1 if mounted, -1 on error * Return 0 if not mounted, 1 if mounted, -1 on error
*/ */
static int static int
virStorageBackendFileSystemIsMounted(virStoragePoolObjPtr pool) { virStorageBackendFileSystemIsMounted(virStoragePoolObjPtr pool)
{
FILE *mtab; FILE *mtab;
struct mntent ent; struct mntent ent;
char buf[1024]; char buf[1024];
...@@ -363,7 +364,8 @@ virStorageBackendFileSystemIsMounted(virStoragePoolObjPtr pool) { ...@@ -363,7 +364,8 @@ virStorageBackendFileSystemIsMounted(virStoragePoolObjPtr pool) {
* Returns 0 if successfully mounted, -1 on error * Returns 0 if successfully mounted, -1 on error
*/ */
static int static int
virStorageBackendFileSystemMount(virStoragePoolObjPtr pool) { virStorageBackendFileSystemMount(virStoragePoolObjPtr pool)
{
char *src = NULL; char *src = NULL;
/* 'mount -t auto' doesn't seem to auto determine nfs (or cifs), /* 'mount -t auto' doesn't seem to auto determine nfs (or cifs),
* while plain 'mount' does. We have to craft separate argvs to * while plain 'mount' does. We have to craft separate argvs to
...@@ -467,7 +469,8 @@ cleanup: ...@@ -467,7 +469,8 @@ cleanup:
* Returns 0 if successfully unmounted, -1 on error * Returns 0 if successfully unmounted, -1 on error
*/ */
static int static int
virStorageBackendFileSystemUnmount(virStoragePoolObjPtr pool) { virStorageBackendFileSystemUnmount(virStoragePoolObjPtr pool)
{
virCommandPtr cmd = NULL; virCommandPtr cmd = NULL;
int ret = -1; int ret = -1;
int rc; int rc;
...@@ -562,7 +565,8 @@ virStorageBackendFileSystemStart(virConnectPtr conn ATTRIBUTE_UNUSED, ...@@ -562,7 +565,8 @@ virStorageBackendFileSystemStart(virConnectPtr conn ATTRIBUTE_UNUSED,
#if WITH_BLKID #if WITH_BLKID
static virStoragePoolProbeResult static virStoragePoolProbeResult
virStorageBackendFileSystemProbe(const char *device, virStorageBackendFileSystemProbe(const char *device,
const char *format) { const char *format)
{
virStoragePoolProbeResult ret = FILESYSTEM_PROBE_ERROR; virStoragePoolProbeResult ret = FILESYSTEM_PROBE_ERROR;
blkid_probe probe = NULL; blkid_probe probe = NULL;
......
...@@ -68,7 +68,8 @@ static void storageDriverUnlock(virStorageDriverStatePtr driver) ...@@ -68,7 +68,8 @@ static void storageDriverUnlock(virStorageDriverStatePtr driver)
} }
static void static void
storageDriverAutostart(virStorageDriverStatePtr driver) { storageDriverAutostart(virStorageDriverStatePtr driver)
{
size_t i; size_t i;
virConnectPtr conn = NULL; virConnectPtr conn = NULL;
...@@ -217,7 +218,8 @@ storageStateAutoStart(void) ...@@ -217,7 +218,8 @@ storageStateAutoStart(void)
* files and update its state * files and update its state
*/ */
static int static int
storageStateReload(void) { storageStateReload(void)
{
if (!driverState) if (!driverState)
return -1; return -1;
...@@ -238,7 +240,8 @@ storageStateReload(void) { ...@@ -238,7 +240,8 @@ storageStateReload(void) {
* Shutdown the storage driver, it will stop all active storage pools * Shutdown the storage driver, it will stop all active storage pools
*/ */
static int static int
storageStateCleanup(void) { storageStateCleanup(void)
{
if (!driverState) if (!driverState)
return -1; return -1;
...@@ -260,7 +263,8 @@ storageStateCleanup(void) { ...@@ -260,7 +263,8 @@ storageStateCleanup(void) {
static virStoragePoolPtr static virStoragePoolPtr
storagePoolLookupByUUID(virConnectPtr conn, storagePoolLookupByUUID(virConnectPtr conn,
const unsigned char *uuid) { const unsigned char *uuid)
{
virStorageDriverStatePtr driver = conn->storagePrivateData; virStorageDriverStatePtr driver = conn->storagePrivateData;
virStoragePoolObjPtr pool; virStoragePoolObjPtr pool;
virStoragePoolPtr ret = NULL; virStoragePoolPtr ret = NULL;
...@@ -289,7 +293,8 @@ cleanup: ...@@ -289,7 +293,8 @@ cleanup:
static virStoragePoolPtr static virStoragePoolPtr
storagePoolLookupByName(virConnectPtr conn, storagePoolLookupByName(virConnectPtr conn,
const char *name) { const char *name)
{
virStorageDriverStatePtr driver = conn->storagePrivateData; virStorageDriverStatePtr driver = conn->storagePrivateData;
virStoragePoolObjPtr pool; virStoragePoolObjPtr pool;
virStoragePoolPtr ret = NULL; virStoragePoolPtr ret = NULL;
...@@ -317,7 +322,8 @@ cleanup: ...@@ -317,7 +322,8 @@ cleanup:
} }
static virStoragePoolPtr static virStoragePoolPtr
storagePoolLookupByVolume(virStorageVolPtr vol) { storagePoolLookupByVolume(virStorageVolPtr vol)
{
virStorageDriverStatePtr driver = vol->conn->storagePrivateData; virStorageDriverStatePtr driver = vol->conn->storagePrivateData;
virStoragePoolObjPtr pool; virStoragePoolObjPtr pool;
virStoragePoolPtr ret = NULL; virStoragePoolPtr ret = NULL;
...@@ -359,13 +365,15 @@ storageOpen(virConnectPtr conn, ...@@ -359,13 +365,15 @@ storageOpen(virConnectPtr conn,
} }
static int static int
storageClose(virConnectPtr conn) { storageClose(virConnectPtr conn)
{
conn->storagePrivateData = NULL; conn->storagePrivateData = NULL;
return 0; return 0;
} }
static int static int
storageConnectNumOfStoragePools(virConnectPtr conn) { storageConnectNumOfStoragePools(virConnectPtr conn)
{
virStorageDriverStatePtr driver = conn->storagePrivateData; virStorageDriverStatePtr driver = conn->storagePrivateData;
size_t i; size_t i;
int nactive = 0; int nactive = 0;
...@@ -390,7 +398,8 @@ storageConnectNumOfStoragePools(virConnectPtr conn) { ...@@ -390,7 +398,8 @@ storageConnectNumOfStoragePools(virConnectPtr conn) {
static int static int
storageConnectListStoragePools(virConnectPtr conn, storageConnectListStoragePools(virConnectPtr conn,
char **const names, char **const names,
int nnames) { int nnames)
{
virStorageDriverStatePtr driver = conn->storagePrivateData; virStorageDriverStatePtr driver = conn->storagePrivateData;
int got = 0; int got = 0;
size_t i; size_t i;
...@@ -424,7 +433,8 @@ storageConnectListStoragePools(virConnectPtr conn, ...@@ -424,7 +433,8 @@ storageConnectListStoragePools(virConnectPtr conn,
} }
static int static int
storageConnectNumOfDefinedStoragePools(virConnectPtr conn) { storageConnectNumOfDefinedStoragePools(virConnectPtr conn)
{
virStorageDriverStatePtr driver = conn->storagePrivateData; virStorageDriverStatePtr driver = conn->storagePrivateData;
size_t i; size_t i;
int nactive = 0; int nactive = 0;
...@@ -449,7 +459,8 @@ storageConnectNumOfDefinedStoragePools(virConnectPtr conn) { ...@@ -449,7 +459,8 @@ storageConnectNumOfDefinedStoragePools(virConnectPtr conn) {
static int static int
storageConnectListDefinedStoragePools(virConnectPtr conn, storageConnectListDefinedStoragePools(virConnectPtr conn,
char **const names, char **const names,
int nnames) { int nnames)
{
virStorageDriverStatePtr driver = conn->storagePrivateData; virStorageDriverStatePtr driver = conn->storagePrivateData;
int got = 0; int got = 0;
size_t i; size_t i;
...@@ -686,7 +697,8 @@ cleanup: ...@@ -686,7 +697,8 @@ cleanup:
} }
static int static int
storagePoolUndefine(virStoragePoolPtr obj) { storagePoolUndefine(virStoragePoolPtr obj)
{
virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStorageDriverStatePtr driver = obj->conn->storagePrivateData;
virStoragePoolObjPtr pool; virStoragePoolObjPtr pool;
int ret = -1; int ret = -1;
...@@ -795,7 +807,8 @@ cleanup: ...@@ -795,7 +807,8 @@ cleanup:
static int static int
storagePoolBuild(virStoragePoolPtr obj, storagePoolBuild(virStoragePoolPtr obj,
unsigned int flags) { unsigned int flags)
{
virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStorageDriverStatePtr driver = obj->conn->storagePrivateData;
virStoragePoolObjPtr pool; virStoragePoolObjPtr pool;
virStorageBackendPtr backend; virStorageBackendPtr backend;
...@@ -837,7 +850,8 @@ cleanup: ...@@ -837,7 +850,8 @@ cleanup:
static int static int
storagePoolDestroy(virStoragePoolPtr obj) { storagePoolDestroy(virStoragePoolPtr obj)
{
virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStorageDriverStatePtr driver = obj->conn->storagePrivateData;
virStoragePoolObjPtr pool; virStoragePoolObjPtr pool;
virStorageBackendPtr backend; virStorageBackendPtr backend;
...@@ -899,7 +913,8 @@ cleanup: ...@@ -899,7 +913,8 @@ cleanup:
static int static int
storagePoolDelete(virStoragePoolPtr obj, storagePoolDelete(virStoragePoolPtr obj,
unsigned int flags) { unsigned int flags)
{
virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStorageDriverStatePtr driver = obj->conn->storagePrivateData;
virStoragePoolObjPtr pool; virStoragePoolObjPtr pool;
virStorageBackendPtr backend; virStorageBackendPtr backend;
...@@ -1016,7 +1031,8 @@ cleanup: ...@@ -1016,7 +1031,8 @@ cleanup:
static int static int
storagePoolGetInfo(virStoragePoolPtr obj, storagePoolGetInfo(virStoragePoolPtr obj,
virStoragePoolInfoPtr info) { virStoragePoolInfoPtr info)
{
virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStorageDriverStatePtr driver = obj->conn->storagePrivateData;
virStoragePoolObjPtr pool; virStoragePoolObjPtr pool;
int ret = -1; int ret = -1;
...@@ -1092,7 +1108,8 @@ cleanup: ...@@ -1092,7 +1108,8 @@ cleanup:
static int static int
storagePoolGetAutostart(virStoragePoolPtr obj, storagePoolGetAutostart(virStoragePoolPtr obj,
int *autostart) { int *autostart)
{
virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStorageDriverStatePtr driver = obj->conn->storagePrivateData;
virStoragePoolObjPtr pool; virStoragePoolObjPtr pool;
int ret = -1; int ret = -1;
...@@ -1125,7 +1142,8 @@ cleanup: ...@@ -1125,7 +1142,8 @@ cleanup:
static int static int
storagePoolSetAutostart(virStoragePoolPtr obj, storagePoolSetAutostart(virStoragePoolPtr obj,
int autostart) { int autostart)
{
virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStorageDriverStatePtr driver = obj->conn->storagePrivateData;
virStoragePoolObjPtr pool; virStoragePoolObjPtr pool;
int ret = -1; int ret = -1;
...@@ -1187,7 +1205,8 @@ cleanup: ...@@ -1187,7 +1205,8 @@ cleanup:
static int static int
storagePoolNumOfVolumes(virStoragePoolPtr obj) { storagePoolNumOfVolumes(virStoragePoolPtr obj)
{
virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStorageDriverStatePtr driver = obj->conn->storagePrivateData;
virStoragePoolObjPtr pool; virStoragePoolObjPtr pool;
int ret = -1; int ret = -1;
...@@ -1227,7 +1246,8 @@ cleanup: ...@@ -1227,7 +1246,8 @@ cleanup:
static int static int
storagePoolListVolumes(virStoragePoolPtr obj, storagePoolListVolumes(virStoragePoolPtr obj,
char **const names, char **const names,
int maxnames) { int maxnames)
{
virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStorageDriverStatePtr driver = obj->conn->storagePrivateData;
virStoragePoolObjPtr pool; virStoragePoolObjPtr pool;
size_t i; size_t i;
...@@ -1278,7 +1298,8 @@ storagePoolListVolumes(virStoragePoolPtr obj, ...@@ -1278,7 +1298,8 @@ storagePoolListVolumes(virStoragePoolPtr obj,
static int static int
storagePoolListAllVolumes(virStoragePoolPtr pool, storagePoolListAllVolumes(virStoragePoolPtr pool,
virStorageVolPtr **vols, virStorageVolPtr **vols,
unsigned int flags) { unsigned int flags)
{
virStorageDriverStatePtr driver = pool->conn->storagePrivateData; virStorageDriverStatePtr driver = pool->conn->storagePrivateData;
virStoragePoolObjPtr obj; virStoragePoolObjPtr obj;
size_t i; size_t i;
...@@ -1351,7 +1372,8 @@ storagePoolListAllVolumes(virStoragePoolPtr pool, ...@@ -1351,7 +1372,8 @@ storagePoolListAllVolumes(virStoragePoolPtr pool,
static virStorageVolPtr static virStorageVolPtr
storageVolLookupByName(virStoragePoolPtr obj, storageVolLookupByName(virStoragePoolPtr obj,
const char *name) { const char *name)
{
virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStorageDriverStatePtr driver = obj->conn->storagePrivateData;
virStoragePoolObjPtr pool; virStoragePoolObjPtr pool;
virStorageVolDefPtr vol; virStorageVolDefPtr vol;
...@@ -1397,7 +1419,8 @@ cleanup: ...@@ -1397,7 +1419,8 @@ cleanup:
static virStorageVolPtr static virStorageVolPtr
storageVolLookupByKey(virConnectPtr conn, storageVolLookupByKey(virConnectPtr conn,
const char *key) { const char *key)
{
virStorageDriverStatePtr driver = conn->storagePrivateData; virStorageDriverStatePtr driver = conn->storagePrivateData;
size_t i; size_t i;
virStorageVolPtr ret = NULL; virStorageVolPtr ret = NULL;
...@@ -1436,7 +1459,8 @@ cleanup: ...@@ -1436,7 +1459,8 @@ cleanup:
static virStorageVolPtr static virStorageVolPtr
storageVolLookupByPath(virConnectPtr conn, storageVolLookupByPath(virConnectPtr conn,
const char *path) { const char *path)
{
virStorageDriverStatePtr driver = conn->storagePrivateData; virStorageDriverStatePtr driver = conn->storagePrivateData;
size_t i; size_t i;
virStorageVolPtr ret = NULL; virStorageVolPtr ret = NULL;
...@@ -2459,7 +2483,8 @@ storageVolWipe(virStorageVolPtr obj, ...@@ -2459,7 +2483,8 @@ storageVolWipe(virStorageVolPtr obj,
static int static int
storageVolGetInfo(virStorageVolPtr obj, storageVolGetInfo(virStorageVolPtr obj,
virStorageVolInfoPtr info) { virStorageVolInfoPtr info)
{
virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStorageDriverStatePtr driver = obj->conn->storagePrivateData;
virStoragePoolObjPtr pool; virStoragePoolObjPtr pool;
virStorageBackendPtr backend; virStorageBackendPtr backend;
...@@ -2572,7 +2597,8 @@ cleanup: ...@@ -2572,7 +2597,8 @@ cleanup:
} }
static char * static char *
storageVolGetPath(virStorageVolPtr obj) { storageVolGetPath(virStorageVolPtr obj)
{
virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStorageDriverStatePtr driver = obj->conn->storagePrivateData;
virStoragePoolObjPtr pool; virStoragePoolObjPtr pool;
virStorageVolDefPtr vol; virStorageVolDefPtr vol;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册