[libvirt] [PATCH v3 3/8] storage: Rework ret logic in storageBackendUpdateVolTargetInfo
Rather than overload @ret with trying serve multiple purposes,
let's initialize @ret to -1 and introduce an @rc function return
value that can be used for functions that may return -1 or -2
and only override @ret when rc < 0.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/storage/storage_util.c | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
index 57624425d0..df3dfeb319 100644
--- a/src/storage/storage_util.c
+++ b/src/storage/storage_util.c
@@ -1754,24 +1754,26 @@ storageBackendUpdateVolTargetInfo(virStorageVolType voltype,
unsigned int openflags,
unsigned int readflags)
{
- int ret, fd = -1;
+ int ret = -1;
+ int rc;
+ int fd = -1;
struct stat sb;
ssize_t len = VIR_STORAGE_MAX_HEADER;
VIR_AUTOFREE(char *) buf = NULL;
- if ((ret = virStorageBackendVolOpen(target->path, &sb, openflags)) < 0)
- goto cleanup;
- fd = ret;
+ if ((rc = virStorageBackendVolOpen(target->path, &sb, openflags)) < 0)
+ return rc;
+ fd = rc;
- if ((ret = virStorageBackendUpdateVolTargetInfoFD(target, fd, &sb)) < 0)
+ if ((virStorageBackendUpdateVolTargetInfoFD(target, fd, &sb)) < 0)
goto cleanup;
if ((voltype == VIR_STORAGE_VOL_FILE || voltype == VIR_STORAGE_VOL_BLOCK) &&
target->format != VIR_STORAGE_FILE_NONE) {
if (S_ISDIR(sb.st_mode)) {
if (storageBackendIsPloopDir(target->path)) {
- if ((ret = storageBackendRedoPloopUpdate(target, &sb, &fd,
- openflags)) < 0)
+ if ((storageBackendRedoPloopUpdate(target, &sb, &fd,
+ openflags)) < 0)
goto cleanup;
target->format = VIR_STORAGE_FILE_PLOOP;
} else {
@@ -1782,7 +1784,6 @@ storageBackendUpdateVolTargetInfo(virStorageVolType voltype,
if (lseek(fd, 0, SEEK_SET) == (off_t)-1) {
virReportSystemError(errno, _("cannot seek to start of
'%s'"), target->path);
- ret = -1;
goto cleanup;
}
@@ -1795,23 +1796,24 @@ storageBackendUpdateVolTargetInfo(virStorageVolType voltype,
virReportSystemError(errno,
_("cannot read header '%s'"),
target->path);
- ret = -1;
}
goto cleanup;
}
- if (virStorageSourceUpdateCapacity(target, buf, len, false) < 0) {
- ret = -1;
+ if (virStorageSourceUpdateCapacity(target, buf, len, false) < 0)
goto cleanup;
- }
}
if (withBlockVolFormat) {
- if ((ret = virStorageBackendDetectBlockVolFormatFD(target, fd,
- readflags)) < 0)
+ if ((rc = virStorageBackendDetectBlockVolFormatFD(target, fd,
+ readflags)) < 0) {
+ ret = rc;
goto cleanup;
+ }
}
+ ret = 0;
+
cleanup:
VIR_FORCE_CLOSE(fd);
return ret;
--
2.20.1