From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id E5BAC1FF0AA for ; Tue, 17 Nov 2026 21:41:21 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 457442170B; Tue, 17 Nov 2026 21:40:51 +0100 (CET) From: "Max R. Carrara" To: pve-devel@lists.proxmox.com Subject: [PATCH pve-storage v3 07/51] plugin: break up if-elsif chain into separate if-blocks Date: Tue, 17 Nov 2026 21:38:39 +0100 Message-ID: <20261117203953.913035-8-m.carrara@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261117203953.913035-1-m.carrara@proxmox.com> References: <20261117203953.913035-1-m.carrara@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1794948008219 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.272 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: P5J6R4UVV6ZUT2UKOFGUV6ZWXH6FIOBS X-Message-ID-Hash: P5J6R4UVV6ZUT2UKOFGUV6ZWXH6FIOBS X-MailFrom: m.carrara@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Wolfgang Bumiller X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Done in order to make future changes a bit easier. Signed-off-by: Max R. Carrara --- 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 febef741..d316caac 100644 --- a/src/PVE/Storage/Plugin.pm +++ b/src/PVE/Storage/Plugin.pm @@ -884,34 +884,48 @@ sub parse_volname { parse_name_dir($basename); my ($vmid, $name) = ($3, $4); my (undef, $format, $isBase) = parse_name_dir($name); my $vtype = $class->guest_volume_vtype($format, $name); return ($vtype, $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); my $vtype = $class->guest_volume_vtype($format, $name); return ($vtype, $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