From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id D5F9C60B1E for ; Thu, 3 Sep 2020 13:38:33 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C16B1184FA for ; Thu, 3 Sep 2020 13:38:03 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 9BB49184EF for ; Thu, 3 Sep 2020 13:38:02 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 6E001449EA for ; Thu, 3 Sep 2020 13:38:02 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Thu, 3 Sep 2020 13:37:59 +0200 Message-Id: <20200903113759.32251-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.091 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records 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_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [time.rs] Subject: [pbs-devel] [PATCH proxmox] tools/time: give tm struct as mut reference X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 11:38:33 -0000 mktime/timegm can modify the timestruct (to normalize the time, e.g. convert the january 40 to february 9) to use that feature, we have to give a mutable reference, else the struct will be copied and the original left untouched Signed-off-by: Dominik Csapak --- this is necessary for my upcoming series for calendarevents proxmox/src/tools/time.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/proxmox/src/tools/time.rs b/proxmox/src/tools/time.rs index 033e778..50cce01 100644 --- a/proxmox/src/tools/time.rs +++ b/proxmox/src/tools/time.rs @@ -3,10 +3,11 @@ use anyhow::{bail, Error}; /// Safe bindings to libc timelocal /// /// We set tm_isdst to -1. -pub fn timelocal(mut t: libc::tm) -> Result { +/// This also normalizes the parameter +pub fn timelocal(t: &mut libc::tm) -> Result { t.tm_isdst = -1; - let epoch = unsafe { libc::mktime(&mut t) }; + let epoch = unsafe { libc::mktime(t) }; if epoch == -1 { bail!("libc::mktime failed for {:?}", t); } @@ -16,10 +17,11 @@ pub fn timelocal(mut t: libc::tm) -> Result { /// Safe bindings to libc timegm /// /// We set tm_isdst to 0. -pub fn timegm(mut t: libc::tm) -> Result { +/// This also normalizes the parameter +pub fn timegm(t: &mut libc::tm) -> Result { t.tm_isdst = 0; - let epoch = unsafe { libc::timegm(&mut t) }; + let epoch = unsafe { libc::timegm(t) }; if epoch == -1 { bail!("libc::timegm failed for {:?}", t); } -- 2.20.1