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 DC01F60B47 for ; Thu, 3 Sep 2020 13:40:33 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D365B18564 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 DE9CA18522 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 A6D2E449FA 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:52 +0200 Message-Id: <20200903114000.6932-3-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.089 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 02/10] tools/systemd/time: move continue out of the if/else 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:33 -0000 will be called anyway Signed-off-by: Dominik Csapak --- src/tools/systemd/time.rs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/tools/systemd/time.rs b/src/tools/systemd/time.rs index edf26505..a6db8a92 100644 --- a/src/tools/systemd/time.rs +++ b/src/tools/systemd/time.rs @@ -183,12 +183,11 @@ pub fn compute_next_event( { // try next day t.add_days(n - day_num, true)?; - continue; } else { // try next week t.add_days(7 - day_num, true)?; - continue; } + continue; } } @@ -201,12 +200,11 @@ pub fn compute_next_event( if let Some(n) = DateTimeValue::find_next(&event.hour, hour) { // test next hour t.set_time(n as libc::c_int, 0, 0)?; - continue; } else { // test next day t.add_days(1, true)?; - continue; } + continue; } } @@ -219,12 +217,11 @@ pub fn compute_next_event( if let Some(n) = DateTimeValue::find_next(&event.minute, minute) { // test next minute t.set_min_sec(n as libc::c_int, 0)?; - continue; } else { // test next hour t.set_time(t.hour() + 1, 0, 0)?; - continue; } + continue; } } @@ -237,12 +234,11 @@ pub fn compute_next_event( if let Some(n) = DateTimeValue::find_next(&event.second, second) { // test next second t.set_sec(n as libc::c_int)?; - continue; } else { // test next min t.set_min_sec(t.min() + 1, 0)?; - continue; } + continue; } } -- 2.20.1