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 8968660AEE for ; Thu, 3 Sep 2020 13:40:03 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 86D5618552 for ; Thu, 3 Sep 2020 13:40: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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id EE1D51852A for ; Thu, 3 Sep 2020 13:40:01 +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 B589A449FD for ; Thu, 3 Sep 2020 13:40:01 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Thu, 3 Sep 2020 13:39:54 +0200 Message-Id: <20200903114000.6932-5-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200903114000.6932-1-d.csapak@proxmox.com> References: <20200903114000.6932-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.090 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-backup 04/10] tools/systemd/tm_editor: remove reset_time from add_days and document it 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:40:03 -0000 we never passed 'false' to it anyway so remove it (we can add it again if we should ever need it) also remove the adding of wday (gets normalized anyway) and set changes to all, since adding days can wrap the month and year too (all other fields get set by us here explicitely) Signed-off-by: Dominik Csapak --- src/tools/systemd/time.rs | 6 +++--- src/tools/systemd/tm_editor.rs | 15 ++++++--------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/tools/systemd/time.rs b/src/tools/systemd/time.rs index 6c7cefec..b6899b0c 100644 --- a/src/tools/systemd/time.rs +++ b/src/tools/systemd/time.rs @@ -183,10 +183,10 @@ pub fn compute_next_event( .find(|d| event.days.contains(WeekDays::from_bits(1< Result<(), Error> { + /// increases the day by 'days' and resets all smaller fields to their minimum + pub fn add_days(&mut self, days: libc::c_int) -> Result<(), Error> { if days == 0 { return Ok(()); } - if reset_time { - self.t.tm_hour = 0; - self.t.tm_min = 0; - self.t.tm_sec = 0; - self.changes.insert(TMChanges::HOUR|TMChanges::MIN|TMChanges::SEC); - } + self.t.tm_hour = 0; + self.t.tm_min = 0; + self.t.tm_sec = 0; self.t.tm_mday += days; - self.t.tm_wday += days; - self.changes.insert(TMChanges::MDAY|TMChanges::WDAY); + self.changes = TMChanges::all(); // adding a day can wrap the month/year too self.normalize_time() } -- 2.20.1