Re: [libvirt] [PATCH 2/3] 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. Signed-off-by: John Ferlan <jferlan(a)redhat.com&gt; --- src/storage/storage_backend.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 6bdfbf1..eebf039 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -2777,10 +2777,6 @@ virStorageBackendBLKIDFindEmpty(const char *device, rc == VIR_STORAGE_BLKID_PROBE_UNKNOWN) { rc = virStorageBackendBLKIDFindPart(probe, device, format); - if (rc == VIR_STORAGE_BLKID_PROBE_UNKNOWN) { - ret = -2; - goto cleanup; - } } switch (rc) { @@ -2799,10 +2795,7 @@ virStorageBackendBLKIDFindEmpty(const char *device, break; case VIR_STORAGE_BLKID_PROBE_UNKNOWN: - virReportError(VIR_ERR_STORAGE_PROBE_FAILED, - _("Not capable of probing for format type '%s', " - "requires build --overwrite"), - format); + ret = -2;