From: John Ferlan <jferlan@redhat.com>
Date: Mon, 7 Dec 2015 13:26:42 +0000 (-0500)
Subject: storage: Refactor virStorageBackendFileSystemGetPoolSource
X-Git-Tag: v1.3.1-rc1~187
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61c29fe56f3a604c8c05f998aa46f2bfa3c1454e;p=thirdparty%2Flibvirt.git

storage: Refactor virStorageBackendFileSystemGetPoolSource

Refactor code to use standard return functioning with respect to setting
a ret value and going to cleanup.
---

diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index fed0b779e1..3a6f130cc0 100644
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -418,6 +418,7 @@ virStorageBackendFileSystemGetPoolSource(virStoragePoolObjPtr pool)
 static int
 virStorageBackendFileSystemIsMounted(virStoragePoolObjPtr pool)
 {
+    int ret = -1;
     FILE *mtab;
     struct mntent ent;
     char buf[1024];
@@ -426,18 +427,21 @@ virStorageBackendFileSystemIsMounted(virStoragePoolObjPtr pool)
         virReportSystemError(errno,
                              _("cannot read mount list '%s'"),
                              _PATH_MOUNTED);
-        return -1;
+        goto cleanup;
     }
 
     while ((getmntent_r(mtab, &ent, buf, sizeof(buf))) != NULL) {
         if (STREQ(ent.mnt_dir, pool->def->target.path)) {
-            VIR_FORCE_FCLOSE(mtab);
-            return 1;
+            ret = 1;
+            goto cleanup;
         }
     }
 
+    ret = 0;
+
+ cleanup:
     VIR_FORCE_FCLOSE(mtab);
-    return 0;
+    return ret;
 }
 
 /**