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 822581FF0C0 for ; Wed, 18 Nov 2026 15:46:01 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 3314D2184C; Wed, 18 Nov 2026 15:45:25 +0100 (CET) From: Daniel Kral To: pve-devel@lists.proxmox.com Subject: [PATCH ha-manager v4 05/17] make parse_sid always return an array Date: Wed, 18 Nov 2026 15:44:50 +0100 Message-ID: <20261118144502.231134-6-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: 1795013118961 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.481 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: 6MZYZXMFYCINSRWT7R75CIGE2SQAQHGQ X-Message-ID-Hash: 6MZYZXMFYCINSRWT7R75CIGE2SQAQHGQ 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: parse_sid() is only called within the pve-ha-manager package and there are only two callers, which only need the $sid return value. In preparation of the changes in the following patches and reduce the clutter introduced by a wantarray, always return an array and adapt its callers as $sid is already the first value in the returned array. Signed-off-by: Daniel Kral Reviewed-by: Michael Köppl Tested-by: Michael Köppl --- src/PVE/API2/HA/Resources.pm | 2 +- src/PVE/CLI/ha_manager.pm | 2 +- src/PVE/HA/Config.pm | 2 +- src/PVE/HA/Sim/Env.pm | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/PVE/API2/HA/Resources.pm b/src/PVE/API2/HA/Resources.pm index 5c9dd6b9..a8ee5ac7 100644 --- a/src/PVE/API2/HA/Resources.pm +++ b/src/PVE/API2/HA/Resources.pm @@ -222,7 +222,7 @@ __PACKAGE__->register_method({ my $cfg = PVE::HA::Config::read_resources_config(); my $exclude_group_property = PVE::HA::Config::have_groups_been_migrated(); - my $sid = PVE::HA::Config::parse_sid($param->{sid}); + my ($sid) = PVE::HA::Config::parse_sid($param->{sid}); return &$api_copy_config($cfg, $sid, $exclude_group_property); }, diff --git a/src/PVE/CLI/ha_manager.pm b/src/PVE/CLI/ha_manager.pm index 2f89887f..2bec33cb 100644 --- a/src/PVE/CLI/ha_manager.pm +++ b/src/PVE/CLI/ha_manager.pm @@ -104,7 +104,7 @@ __PACKAGE__->register_method({ code => sub { my ($param) = @_; - my $sid = PVE::HA::Config::parse_sid(extract_param($param, 'sid')); + my ($sid) = PVE::HA::Config::parse_sid(extract_param($param, 'sid')); PVE::HA::Config::service_is_ha_managed($sid); diff --git a/src/PVE/HA/Config.pm b/src/PVE/HA/Config.pm index 07290eee..be535329 100644 --- a/src/PVE/HA/Config.pm +++ b/src/PVE/HA/Config.pm @@ -218,7 +218,7 @@ sub parse_sid { die "unable to parse service id '$sid'\n"; } - return wantarray ? ($sid, $type, $vmid) : $sid; + return ($sid, $type, $vmid); } sub read_rules_config { diff --git a/src/PVE/HA/Sim/Env.pm b/src/PVE/HA/Sim/Env.pm index d3c4a11d..311eaad1 100644 --- a/src/PVE/HA/Sim/Env.pm +++ b/src/PVE/HA/Sim/Env.pm @@ -234,7 +234,7 @@ sub parse_sid { my $vmid = $2; my $type = $1; - return wantarray ? ($sid, $type, $vmid) : $sid; + return ($sid, $type, $vmid); } sub read_fence_config { -- 2.47.3