From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dcsapak@zita.proxmox.com>
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 42F7E60BBA
for <pbs-devel@lists.proxmox.com>; Thu, 3 Sep 2020 13:40:37 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 258D1185FE
for <pbs-devel@lists.proxmox.com>; Thu, 3 Sep 2020 13:40:07 +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 A9D7D1854F
for <pbs-devel@lists.proxmox.com>; Thu, 3 Sep 2020 13:40: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 71CFD449EA
for <pbs-devel@lists.proxmox.com>; Thu, 3 Sep 2020 13:40:02 +0200 (CEST)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Thu, 3 Sep 2020 13:39:57 +0200
Message-Id: <20200903114000.6932-8-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.335 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
KAM_NUMSUBJECT 0.5 Subject ends in numbers excluding current years
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 07/10] tools/systemd/time: use
i32 for DateTimeValues instead of u32
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Thu, 03 Sep 2020 11:40:37 -0000
for most of the fields it does not matter
(mon,day,hour,min,sec)
but for years it matters, since negative years in a tm struct are valid
so to be able to handle that, convert those to i32
on parsing, we never allow negative numbers anyway
also, this way we can drop the manual casts (which would have been very
wrong if the underlying tm struct would have contained negative values)
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/tools/systemd/parse_time.rs | 2 +-
src/tools/systemd/time.rs | 22 +++++++++++-----------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/tools/systemd/parse_time.rs b/src/tools/systemd/parse_time.rs
index 051c4968..810a9883 100644
--- a/src/tools/systemd/parse_time.rs
+++ b/src/tools/systemd/parse_time.rs
@@ -86,7 +86,7 @@ lazy_static! {
map
};
}
-fn parse_time_comp(max: usize) -> impl Fn(&str) -> IResult<&str, u32> {
+fn parse_time_comp(max: usize) -> impl Fn(&str) -> IResult<&str, i32> {
move |i: &str| {
let (i, v) = map_res(recognize(digit1), str::parse)(i)?;
if (v as usize) >= max {
diff --git a/src/tools/systemd/time.rs b/src/tools/systemd/time.rs
index 83ae19e8..6ce881e7 100644
--- a/src/tools/systemd/time.rs
+++ b/src/tools/systemd/time.rs
@@ -19,14 +19,14 @@ bitflags!{
#[derive(Debug)]
pub enum DateTimeValue {
- Single(u32),
- Range(u32, u32),
- Repeated(u32, u32),
+ Single(i32),
+ Range(i32, i32),
+ Repeated(i32, i32),
}
impl DateTimeValue {
// Test if the entry contains the value
- pub fn contains(&self, value: u32) -> bool {
+ pub fn contains(&self, value: i32) -> bool {
match self {
DateTimeValue::Single(v) => *v == value,
DateTimeValue::Range(start, end) => value >= *start && value <= *end,
@@ -45,14 +45,14 @@ impl DateTimeValue {
}
}
- pub fn list_contains(list: &[DateTimeValue], value: u32) -> bool {
+ pub fn list_contains(list: &[DateTimeValue], value: i32) -> bool {
list.iter().find(|spec| spec.contains(value)).is_some()
}
// Find an return an entry greater than value
- pub fn find_next(list: &[DateTimeValue], value: u32) -> Option<u32> {
- let mut next: Option<u32> = None;
- let mut set_next = |v: u32| {
+ pub fn find_next(list: &[DateTimeValue], value: i32) -> Option<i32> {
+ let mut next: Option<i32> = None;
+ let mut set_next = |v: i32| {
if let Some(n) = next {
if v < n { next = Some(v); }
} else {
@@ -194,7 +194,7 @@ pub fn compute_next_event(
// this day
if !event.hour.is_empty() && t.changes.contains(TMChanges::HOUR) {
- let hour = t.hour() as u32;
+ let hour = t.hour();
if DateTimeValue::list_contains(&event.hour, hour) {
t.changes.remove(TMChanges::HOUR);
} else {
@@ -211,7 +211,7 @@ pub fn compute_next_event(
// this hour
if !event.minute.is_empty() && t.changes.contains(TMChanges::MIN) {
- let minute = t.min() as u32;
+ let minute = t.min();
if DateTimeValue::list_contains(&event.minute, minute) {
t.changes.remove(TMChanges::MIN);
} else {
@@ -228,7 +228,7 @@ pub fn compute_next_event(
// this minute
if !event.second.is_empty() && t.changes.contains(TMChanges::SEC) {
- let second = t.sec() as u32;
+ let second = t.sec();
if DateTimeValue::list_contains(&event.second, second) {
t.changes.remove(TMChanges::SEC);
} else {
--
2.20.1