External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

Clean up usage of 'ret' variable

Browse Source 
Do not store the return value of called functions in the same variable
as the (future) return value of the current function.

This makes tracking the origin of the value easier and reduces
the chance of introducing a new point of exit without resetting
the return value back to -1.
This commit is contained in:
Ján Tomko 2016-01-28 17:44:33 +01:00
parent 28e5655de3
commit 2542eb75bd
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/storage/storage_backend.c
View File

@ -1963,26 +1963,23 @@ virStorageBackendVolZeroSparseFileLocal(virStorageVolDefPtr vol,
off_t size,
int fd)
{
int ret = -1;
ret = ftruncate(fd, 0);
if (ret == -1) {
if (ftruncate(fd, 0) < 0) {
virReportSystemError(errno,
_("Failed to truncate volume with "
"path '%s' to 0 bytes"),
vol->target.path);
return ret;
return -1;
}
ret = ftruncate(fd, size);
if (ret == -1) {
if (ftruncate(fd, size) < 0) {
virReportSystemError(errno,
_("Failed to truncate volume with "
"path '%s' to %ju bytes"),
vol->target.path, (uintmax_t)size);
return -1;
}
return ret;
return 0;
}

5
src/uml/uml_driver.c
View File

@ -1131,12 +1131,11 @@ static int umlStartVMDaemon(virConnectPtr conn,
virCommandSetErrorFD(cmd, &logfd);
virCommandDaemonize(cmd);
ret = virCommandRun(cmd, NULL);
if (ret < 0)
if (virCommandRun(cmd, NULL) < 0)
goto cleanup;
if (autoDestroy &&
(ret = umlProcessAutoDestroyAdd(driver, vm, conn)) < 0)
umlProcessAutoDestroyAdd(driver, vm, conn) < 0)
goto cleanup;
ret = virDomainObjSetDefTransient(driver->caps, driver->xmlopt, vm, false);