[PATCH pve-storage v1 08/54] plugin: break up needless if-elsif chain into separate if-blocks

["Max R. Carrara" <m.carrara@proxmox.com>]

Signed-off-by: Max R. Carrara <m.carrara@proxmox.com>
---
 src/PVE/Storage/Plugin.pm | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm
index 55268b29..2d76f452 100644
--- a/src/PVE/Storage/Plugin.pm
+++ b/src/PVE/Storage/Plugin.pm
@@ -808,29 +808,43 @@ sub parse_volname {
         my ($vmid, $name) = ($3, $4);
         my (undef, $format, $isBase) = parse_name_dir($name);
         return ('images', $name, $vmid, $basename, $basedvmid, $isBase, $format);
-    } elsif ($volname =~ m!^(\d+)/(\S+)$!) {
+    }
+
+    if ($volname =~ m!^(\d+)/(\S+)$!) {
         my ($vmid, $name) = ($1, $2);
         my (undef, $format, $isBase) = parse_name_dir($name);
         return ('images', $name, $vmid, undef, undef, $isBase, $format);
-    } elsif ($volname =~ m!^iso/([^/]+$PVE::Storage::ISO_EXT_RE_0)$!) {
+    }
+
+    if ($volname =~ m!^iso/([^/]+$PVE::Storage::ISO_EXT_RE_0)$!) {
         return ('iso', $1, undef, undef, undef, undef, 'raw');
-    } elsif ($volname =~ m!^vztmpl/([^/]+$PVE::Storage::VZTMPL_EXT_RE_1)$!) {
+    }
+
+    if ($volname =~ m!^vztmpl/([^/]+$PVE::Storage::VZTMPL_EXT_RE_1)$!) {
         return ('vztmpl', $1, undef, undef, undef, undef, 'raw');
-    } elsif ($volname =~ m!^backup/([^/]+$PVE::Storage::BACKUP_EXT_RE_2)$!) {
+    }
+
+    if ($volname =~ m!^backup/([^/]+$PVE::Storage::BACKUP_EXT_RE_2)$!) {
         my $fn = $1;
         if ($fn =~ m/^vzdump-(openvz|lxc|qemu)-(\d+)-.+/) {
             return ('backup', $fn, $2, undef, undef, undef, 'raw');
         }
         return ('backup', $fn, undef, undef, undef, undef, 'raw');
-    } elsif ($volname =~ m!^snippets/([^/]+)$!) {
+    }
+
+    if ($volname =~ m!^snippets/([^/]+)$!) {
         return ('snippets', $1, undef, undef, undef, undef, 'raw');
-    } elsif ($volname =~
+    }
+
+    if ($volname =~
         m!^import/(${PVE::Storage::SAFE_CHAR_WITH_WHITESPACE_CLASS_RE}+\.ova\/${PVE::Storage::OVA_CONTENT_RE_1})$!
     ) {
         my $packed_image = $1;
         my $format = $2;
         return ('import', $packed_image, undef, undef, undef, undef, "ova+$format");
-    } elsif ($volname =~
+    }
+
+    if ($volname =~
         m!^import/(${PVE::Storage::SAFE_CHAR_WITH_WHITESPACE_CLASS_RE}+$PVE::Storage::IMPORT_EXT_RE_1)$!
     ) {
         return ('import', $1, undef, undef, undef, undef, $2);
--
2.47.3