提交 f462f9ad 编写于 作者: J John Ferlan

storage: Clean up return value checking

Rather than special casing the VIR_STORAGE_BLKID_PROBE_UNKNOWN after
calling virStorageBackendBLKIDFindPart, just allow the switch statement
handle setting ret = -2.
上级 d1f5dfc4
...@@ -2777,10 +2777,6 @@ virStorageBackendBLKIDFindEmpty(const char *device, ...@@ -2777,10 +2777,6 @@ virStorageBackendBLKIDFindEmpty(const char *device,
rc == VIR_STORAGE_BLKID_PROBE_UNKNOWN) { rc == VIR_STORAGE_BLKID_PROBE_UNKNOWN) {
rc = virStorageBackendBLKIDFindPart(probe, device, format); rc = virStorageBackendBLKIDFindPart(probe, device, format);
if (rc == VIR_STORAGE_BLKID_PROBE_UNKNOWN) {
ret = -2;
goto cleanup;
}
} }
switch (rc) { switch (rc) {
...@@ -2799,10 +2795,7 @@ virStorageBackendBLKIDFindEmpty(const char *device, ...@@ -2799,10 +2795,7 @@ virStorageBackendBLKIDFindEmpty(const char *device,
break; break;
case VIR_STORAGE_BLKID_PROBE_UNKNOWN: case VIR_STORAGE_BLKID_PROBE_UNKNOWN:
virReportError(VIR_ERR_STORAGE_PROBE_FAILED, ret = -2;
_("Not capable of probing for format type '%s', "
"requires build --overwrite"),
format);
break; break;
case VIR_STORAGE_BLKID_PROBE_MATCH: case VIR_STORAGE_BLKID_PROBE_MATCH:
...@@ -2829,7 +2822,6 @@ virStorageBackendBLKIDFindEmpty(const char *device, ...@@ -2829,7 +2822,6 @@ virStorageBackendBLKIDFindEmpty(const char *device,
ret = -1; ret = -1;
} }
cleanup:
blkid_free_probe(probe); blkid_free_probe(probe);
return ret; return ret;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册