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 C1E5A1FF0AF for ; Fri, 06 Nov 2026 18:23:22 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 23935216E3; Fri, 06 Nov 2026 18:23:07 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox-backup v2 13/43] api: admin: improve code style for status endpoint Date: Fri, 6 Nov 2026 18:22:05 +0100 Message-ID: <20261106172235.890542-14-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261106172235.890542-1-c.ebner@proxmox.com> References: <20261106172235.890542-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1793985775005 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.475 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: NJM457HBYKANTPX4ZJQV5DNWMV3WGE2A X-Message-ID-Hash: NJM457HBYKANTPX4ZJQV5DNWMV3WGE2A X-MailFrom: c.ebner@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 Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Reduces indentation level and makes the if branches more concise. No functional changes. Signed-off-by: Christian Ebner --- src/api2/admin/datastore.rs | 38 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs index 51dae4698..80a39cc8a 100644 --- a/src/api2/admin/datastore.rs +++ b/src/api2/admin/datastore.rs @@ -717,31 +717,23 @@ pub async fn status( let backend_type = datastore.backend_type(); let s3_statistics = datastore.s3_statistics(); - Ok(if store_stats { + let (total, used, avail) = if store_stats { let storage = crate::tools::fs::fs_info(datastore.base_path()).await?; - DataStoreStatus { - total: storage.total, - used: storage.used, - avail: storage.available, - gc_status, - counts, - backend_type, - s3_statistics, - default_retention_timespan: None, - max_retention_timespan: None, - } + (storage.total, storage.used, storage.available) } else { - DataStoreStatus { - total: 0, - used: 0, - avail: 0, - gc_status, - counts, - backend_type, - s3_statistics, - default_retention_timespan: None, - max_retention_timespan: None, - } + (0, 0, 0) + }; + + Ok(DataStoreStatus { + total, + used, + avail, + gc_status, + counts, + backend_type, + s3_statistics, + default_retention_timespan: None, + max_retention_timespan: None, }) } -- 2.47.3