NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix the coding style

Browse Source 
Fix the "if ... else" coding style, and indentions problem.
This commit is contained in:
Osier Yang
2012-12-03 16:41:45 +08:00
parent cc3548abe3
commit 05858b27d4
1 changed files with 57 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
src/libvirt.c
View File

@@ -1199,18 +1199,19 @@ do_open(const char *name,
goto failed; goto failed;
} }
VIR_DEBUG("trying driver %d (%s) ...", VIR_DEBUG("trying driver %d (%s) ...", i, virDriverTab[i]->name);
i, virDriverTab[i]->name);
res = virDriverTab[i]->open(ret, auth, flags); res = virDriverTab[i]->open(ret, auth, flags);
VIR_DEBUG("driver %d %s returned %s", VIR_DEBUG("driver %d %s returned %s",
i, virDriverTab[i]->name, i, virDriverTab[i]->name,
res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" :
(res == VIR_DRV_OPEN_DECLINED ? "DECLINED" : (res == VIR_DRV_OPEN_DECLINED ? "DECLINED" :
(res == VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown status"))); (res == VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown status")));
if (res == VIR_DRV_OPEN_ERROR) goto failed;
else if (res == VIR_DRV_OPEN_SUCCESS) { if (res == VIR_DRV_OPEN_SUCCESS) {
ret->driver = virDriverTab[i]; ret->driver = virDriverTab[i];
break; break;
} else if (res == VIR_DRV_OPEN_ERROR) {
goto failed;
} }
} }
@@ -1225,30 +1226,32 @@ do_open(const char *name,
for (i = 0; i < virNetworkDriverTabCount; i++) { for (i = 0; i < virNetworkDriverTabCount; i++) {
res = virNetworkDriverTab[i]->open(ret, auth, flags); res = virNetworkDriverTab[i]->open(ret, auth, flags);
VIR_DEBUG("network driver %d %s returned %s", VIR_DEBUG("network driver %d %s returned %s",
i, virNetworkDriverTab[i]->name, i, virNetworkDriverTab[i]->name,
res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" :
(res == VIR_DRV_OPEN_DECLINED ? "DECLINED" : (res == VIR_DRV_OPEN_DECLINED ? "DECLINED" :
(res == VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown status"))); (res == VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown status")));
if (res == VIR_DRV_OPEN_ERROR) {
break; if (res == VIR_DRV_OPEN_SUCCESS) {
} else if (res == VIR_DRV_OPEN_SUCCESS) {
ret->networkDriver = virNetworkDriverTab[i]; ret->networkDriver = virNetworkDriverTab[i];
break; break;
} else if (res == VIR_DRV_OPEN_ERROR) {
break;
} }
} }
for (i = 0; i < virInterfaceDriverTabCount; i++) { for (i = 0; i < virInterfaceDriverTabCount; i++) {
res = virInterfaceDriverTab[i]->open(ret, auth, flags); res = virInterfaceDriverTab[i]->open(ret, auth, flags);
VIR_DEBUG("interface driver %d %s returned %s", VIR_DEBUG("interface driver %d %s returned %s",
i, virInterfaceDriverTab[i]->name, i, virInterfaceDriverTab[i]->name,
res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" :
(res == VIR_DRV_OPEN_DECLINED ? "DECLINED" : (res == VIR_DRV_OPEN_DECLINED ? "DECLINED" :
(res == VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown status"))); (res == VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown status")));
if (res == VIR_DRV_OPEN_ERROR) {
break; if (res == VIR_DRV_OPEN_SUCCESS) {
} else if (res == VIR_DRV_OPEN_SUCCESS) {
ret->interfaceDriver = virInterfaceDriverTab[i]; ret->interfaceDriver = virInterfaceDriverTab[i];
break; break;
} else if (res == VIR_DRV_OPEN_ERROR) {
break;
} }
} }
@@ -1256,15 +1259,16 @@ do_open(const char *name,
for (i = 0; i < virStorageDriverTabCount; i++) { for (i = 0; i < virStorageDriverTabCount; i++) {
res = virStorageDriverTab[i]->open(ret, auth, flags); res = virStorageDriverTab[i]->open(ret, auth, flags);
VIR_DEBUG("storage driver %d %s returned %s", VIR_DEBUG("storage driver %d %s returned %s",
i, virStorageDriverTab[i]->name, i, virStorageDriverTab[i]->name,
res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" :
(res == VIR_DRV_OPEN_DECLINED ? "DECLINED" : (res == VIR_DRV_OPEN_DECLINED ? "DECLINED" :
(res == VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown status"))); (res == VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown status")));
if (res == VIR_DRV_OPEN_ERROR) {
break; if (res == VIR_DRV_OPEN_SUCCESS) {
} else if (res == VIR_DRV_OPEN_SUCCESS) {
ret->storageDriver = virStorageDriverTab[i]; ret->storageDriver = virStorageDriverTab[i];
break; break;
} else if (res == VIR_DRV_OPEN_ERROR) {
break;
} }
} }
@@ -1272,15 +1276,16 @@ do_open(const char *name,
for (i = 0; i < virDeviceMonitorTabCount; i++) { for (i = 0; i < virDeviceMonitorTabCount; i++) {
res = virDeviceMonitorTab[i]->open(ret, auth, flags); res = virDeviceMonitorTab[i]->open(ret, auth, flags);
VIR_DEBUG("node driver %d %s returned %s", VIR_DEBUG("node driver %d %s returned %s",
i, virDeviceMonitorTab[i]->name, i, virDeviceMonitorTab[i]->name,
res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" :
(res == VIR_DRV_OPEN_DECLINED ? "DECLINED" : (res == VIR_DRV_OPEN_DECLINED ? "DECLINED" :
(res == VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown status"))); (res == VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown status")));
if (res == VIR_DRV_OPEN_ERROR) {
break; if (res == VIR_DRV_OPEN_SUCCESS) {
} else if (res == VIR_DRV_OPEN_SUCCESS) {
ret->deviceMonitor = virDeviceMonitorTab[i]; ret->deviceMonitor = virDeviceMonitorTab[i];
break; break;
} else if (res == VIR_DRV_OPEN_ERROR) {
break;
} }
} }
@@ -1288,15 +1293,16 @@ do_open(const char *name,
for (i = 0; i < virSecretDriverTabCount; i++) { for (i = 0; i < virSecretDriverTabCount; i++) {
res = virSecretDriverTab[i]->open(ret, auth, flags); res = virSecretDriverTab[i]->open(ret, auth, flags);
VIR_DEBUG("secret driver %d %s returned %s", VIR_DEBUG("secret driver %d %s returned %s",
i, virSecretDriverTab[i]->name, i, virSecretDriverTab[i]->name,
res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" :
(res == VIR_DRV_OPEN_DECLINED ? "DECLINED" : (res == VIR_DRV_OPEN_DECLINED ? "DECLINED" :
(res == VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown status"))); (res == VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown status")));
if (res == VIR_DRV_OPEN_ERROR) {
break; if (res == VIR_DRV_OPEN_SUCCESS) {
} else if (res == VIR_DRV_OPEN_SUCCESS) {
ret->secretDriver = virSecretDriverTab[i]; ret->secretDriver = virSecretDriverTab[i];
break; break;
} else if (res == VIR_DRV_OPEN_ERROR) {
break;
} }
} }
@@ -1304,15 +1310,16 @@ do_open(const char *name,
for (i = 0; i < virNWFilterDriverTabCount; i++) { for (i = 0; i < virNWFilterDriverTabCount; i++) {
res = virNWFilterDriverTab[i]->open(ret, auth, flags); res = virNWFilterDriverTab[i]->open(ret, auth, flags);
VIR_DEBUG("nwfilter driver %d %s returned %s", VIR_DEBUG("nwfilter driver %d %s returned %s",
i, virNWFilterDriverTab[i]->name, i, virNWFilterDriverTab[i]->name,
res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" :
(res == VIR_DRV_OPEN_DECLINED ? "DECLINED" : (res == VIR_DRV_OPEN_DECLINED ? "DECLINED" :
(res == VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown status"))); (res == VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown status")));
if (res == VIR_DRV_OPEN_ERROR) {
break; if (res == VIR_DRV_OPEN_SUCCESS) {
} else if (res == VIR_DRV_OPEN_SUCCESS) {
ret->nwfilterDriver = virNWFilterDriverTab[i]; ret->nwfilterDriver = virNWFilterDriverTab[i];
break; break;
} else if (res == VIR_DRV_OPEN_ERROR) {
break;
} }
} }