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 5A1261FF0C0 for ; Wed, 18 Nov 2026 15:45:44 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 65B66217E7; Wed, 18 Nov 2026 15:45:24 +0100 (CET) From: Daniel Kral To: pve-devel@lists.proxmox.com Subject: [PATCH ha-manager v4 06/17] config: use early returns in parse_sid Date: Wed, 18 Nov 2026 15:44:51 +0100 Message-ID: <20261118144502.231134-7-d.kral@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261118144502.231134-1-d.kral@proxmox.com> References: <20261118144502.231134-1-d.kral@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1795013119018 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.487 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: GRTINCOHGRGBFIRIYAZCUF4RSKZXFHXX X-Message-ID-Hash: GRTINCOHGRGBFIRIYAZCUF4RSKZXFHXX X-MailFrom: d.kral@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 X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: While at it, also make use of the returned matches in list context by assigning them directly to the variables instead of the special $1, $2, ... variables. This is in preparation of an upcoming patch, which moves the conditional vmid parsing and info-fetching branch to its separate helper subroutine. Signed-off-by: Daniel Kral Reviewed-by: Michael Köppl Tested-by: Michael Köppl --- src/PVE/HA/Config.pm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/PVE/HA/Config.pm b/src/PVE/HA/Config.pm index be535329..25465486 100644 --- a/src/PVE/HA/Config.pm +++ b/src/PVE/HA/Config.pm @@ -200,25 +200,21 @@ sub parse_sid { my ($type, $vmid); - if ($sid =~ m/^(\d+)$/) { - $vmid = $1; - + if (($vmid) = $sid =~ m/^(\d+)$/) { my $vmlist = PVE::Cluster::get_vmlist(); if (defined($vmlist->{ids}->{$vmid})) { my $vm_type = $vmlist->{ids}->{$vmid}->{type}; $type = PVE::HA::Tools::get_ha_resource_type($vm_type); $sid = "$type:$vmid"; + return ($sid, $type, $vmid); } else { - die "unable to detect SID from VMID - VM/CT $1 does not exist\n"; + die "unable to detect SID from VMID - VM/CT $vmid does not exist\n"; } - } elsif ($sid =~ m/^(\S+):(\S+)$/) { - $vmid = $2; - $type = $1; + } elsif (($type, $vmid) = $sid =~ m/^(\S+):(\S+)$/) { + return ($sid, $type, $vmid); } else { die "unable to parse service id '$sid'\n"; } - - return ($sid, $type, $vmid); } sub read_rules_config { -- 2.47.3