From 1059c48180ae888a6c64fd851bdb1ca031fc5502 Mon Sep 17 00:00:00 2001 From: John Ferlan Date: Thu, 8 Oct 2015 13:48:14 -0400 Subject: [PATCH] storage: Rework error paths for virStorageBackendCreateExecCommand Rework the code in order to use the "ret = -1;" and goto cleanup; coding style. Signed-off-by: John Ferlan --- src/storage/storage_backend.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index ad7a576fb7..a375fe0f51 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -679,6 +679,7 @@ virStorageBackendCreateExecCommand(virStoragePoolObjPtr pool, uid_t uid; mode_t mode; bool filecreated = false; + int ret = -1; if ((pool->def->type == VIR_STORAGE_POOL_NETFS) && (((geteuid() == 0) @@ -703,11 +704,11 @@ virStorageBackendCreateExecCommand(virStoragePoolObjPtr pool, if (!filecreated) { if (virCommandRun(cmd, NULL) < 0) - return -1; + goto cleanup; if (stat(vol->target.path, &st) < 0) { virReportSystemError(errno, _("failed to create %s"), vol->target.path); - return -1; + goto cleanup; } } @@ -721,7 +722,7 @@ virStorageBackendCreateExecCommand(virStoragePoolObjPtr pool, _("cannot chown %s to (%u, %u)"), vol->target.path, (unsigned int) uid, (unsigned int) gid); - return -1; + goto cleanup; } mode = (vol->target.perms->mode == (mode_t) -1 ? @@ -730,9 +731,13 @@ virStorageBackendCreateExecCommand(virStoragePoolObjPtr pool, virReportSystemError(errno, _("cannot set mode of '%s' to %04o"), vol->target.path, mode); - return -1; + goto cleanup; } - return 0; + + ret = 0; + + cleanup: + return ret; } enum { -- GitLab