From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id CD1FC1FF138 for ; Mon, 20 Jul 2026 14:38:41 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 97CC021603; Mon, 20 Jul 2026 14:37:47 +0200 (CEST) From: Daniel Kral To: pve-devel@lists.proxmox.com Subject: [PATCH ha-manager 06/16] config: use early returns in parse_sid Date: Mon, 20 Jul 2026 14:36:55 +0200 Message-ID: <20260720123705.216089-7-d.kral@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260720123705.216089-1-d.kral@proxmox.com> References: <20260720123705.216089-1-d.kral@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1784551006088 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.293 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_LOW -0.7 Sender listed at https://www.dnswl.org/, low 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: E6ZHC7WGUBMGINVNFZQO4V4PROANIZFS X-Message-ID-Hash: E6ZHC7WGUBMGINVNFZQO4V4PROANIZFS 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: 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 --- src/PVE/HA/Config.pm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/PVE/HA/Config.pm b/src/PVE/HA/Config.pm index 86574dc2..7b49534c 100644 --- a/src/PVE/HA/Config.pm +++ b/src/PVE/HA/Config.pm @@ -198,27 +198,21 @@ sub update_resources_config { sub parse_sid { my ($sid) = @_; - my ($type, $vmid); - - if ($sid =~ m/^(\d+)$/) { - $vmid = $1; - + if (my ($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); + my $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"; } - } elsif ($sid =~ m/^(\S+):(\S+)$/) { - $vmid = $2; - $type = $1; + } elsif (my ($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