From 1f615fddaffd33afc75a582021769583c8f4db4e Mon Sep 17 00:00:00 2001 From: Matthew Booth Date: Mon, 17 Oct 2011 16:07:31 +0100 Subject: [PATCH] NFC: Remove unnecessary goto --- src/inspect_fs_unix.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/inspect_fs_unix.c b/src/inspect_fs_unix.c index 04430e4..34e65bf 100644 --- a/src/inspect_fs_unix.c +++ b/src/inspect_fs_unix.c @@ -877,15 +877,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); -- 1.8.3.1