[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Libguestfs] [PATCH 2/5] NFC: Remove unnecessary goto



---
 src/inspect_fs_unix.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/inspect_fs_unix.c b/src/inspect_fs_unix.c
index ede8c78..1169b1e 100644
--- a/src/inspect_fs_unix.c
+++ b/src/inspect_fs_unix.c
@@ -816,15 +816,13 @@ resolve_fstab_device (guestfs_h *g, const char *spec)
     free (slice);
     free (part);
 
-    if (disk_i == -1 || disk_i > 26 ||
-        slice_i <= 0 || slice_i > 1 /* > 4 .. see comment above */ ||
-        part_i < 0 || part_i >= 26)
-      goto out;
-
-    device = safe_asprintf (g, "/dev/sd%c%d", disk_i + 'a', part_i + 5);
+    if (disk_i != -1 && disk_i <= 26 &&
+        slice_i > 0 && slice_i <= 1 /* > 4 .. see comment above */ &&
+        part_i >= 0 && part_i < 26) {
+      device = safe_asprintf (g, "/dev/sd%c%d", disk_i + 'a', part_i + 5);
+    }
   }
 
- out:
   /* Didn't match device pattern, return original spec unchanged. */
   if (device == NULL)
     device = safe_strdup (g, spec);

[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]