tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tools/systemd/tm_editor: remove reset_time from add_days and document it

Browse Source 
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)

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2020-09-04 14:33:28 +02:00 committed by Dietmar Maurer
parent 15ec790a40
commit 07ca6f6e66
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/systemd/time.rs
View File

@ -181,10 +181,10 @@ pub fn compute_next_event(
.find(|d| event.days.contains(WeekDays::from_bits(1<<d).unwrap()))
{
// try next day
t.add_days(n - day_num, true)?;
t.add_days(n - day_num,)?;
} else {
// try next week
t.add_days(7 - day_num, true)?;
t.add_days(7 - day_num)?;
}
continue;
}
@ -199,7 +199,7 @@ pub fn compute_next_event(
t.set_time(n as libc::c_int, 0, 0)?;
} else {
// test next day
t.add_days(1, true)?;
t.add_days(1)?;
}
continue;
}

12
src/tools/systemd/tm_editor.rs
View File

@ -21,15 +21,13 @@ impl TmEditor {
Ok(epoch)
}
pub fn add_days(&mut self, days: libc::c_int, reset_time: bool) -> 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.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.normalize_time()
}