Fix the coding style

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

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;
} }
} }
@@ -1229,11 +1230,12 @@ do_open(const char *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;
} }
} }
@@ -1244,11 +1246,12 @@ do_open(const char *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;
} }
} }
@@ -1260,11 +1263,12 @@ do_open(const char *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;
} }
} }
@@ -1276,11 +1280,12 @@ do_open(const char *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;
} }
} }
@@ -1292,11 +1297,12 @@ do_open(const char *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;
} }
} }
@@ -1308,11 +1314,12 @@ do_open(const char *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;
} }
} }