From 3599766ceed52ded64987661756b4ec3cf7ed1aa Mon Sep 17 00:00:00 2001 From: Lars Henriksen Date: Sun, 15 Nov 2020 10:23:10 +0100 Subject: Introduce macro DAY DAY(t) is midnight (the day) of time_t t. Signed-off-by: Lars Henriksen Signed-off-by: Lukas Fleischer --- src/recur.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'src/recur.c') diff --git a/src/recur.c b/src/recur.c index 3a16d1e..a6c02a8 100644 --- a/src/recur.c +++ b/src/recur.c @@ -517,8 +517,7 @@ char *recur_apoint_scan(FILE *f, struct tm start, struct tm end, /* Does it occur on the start day? */ if (!recur_item_find_occurrence(tstart, tend - tstart, rpt, NULL, - update_time_in_date(tstart, 0, 0), - NULL)) { + DAY(tstart), NULL)) { char *fmt = _("recurrence error: not on start day (%s)"); return day_ins(&fmt, tstart); } @@ -590,8 +589,7 @@ char *recur_event_scan(FILE * f, struct tm start, int id, /* Does it occur on the start day? */ if (!recur_item_find_occurrence(tstart, -1, rpt, NULL, - update_time_in_date(tstart, 0, 0), - NULL)) { + DAY(tstart), NULL)) { char *fmt = _("recurrence error: not on start day (%s)"); return day_ins(&fmt, tstart); } @@ -1209,7 +1207,7 @@ static int expand_monthly(time_t start, long dur, struct rpt *rpt, llist_t *exc, -WEEKINDAYS ); r.until = date_sec_change( - update_time_in_date(nstart, 0, 0), + DAY(nstart), 0, r.freq * WEEKINDAYS ); @@ -1243,7 +1241,7 @@ static int expand_monthly(time_t start, long dur, struct rpt *rpt, llist_t *exc, -WEEKINDAYS ); r.until = date_sec_change( - update_time_in_date(nstart, 0, 0), + DAY(nstart), 0, r.freq * WEEKINDAYS ); @@ -1349,7 +1347,7 @@ static int expand_yearly(time_t start, long dur, struct rpt *rpt, llist_t *exc, -WEEKINDAYS ); r.until = date_sec_change( - update_time_in_date(nstart, 0, 0), + DAY(nstart), 0, r.freq * WEEKINDAYS ); @@ -1394,7 +1392,7 @@ static int expand_yearly(time_t start, long dur, struct rpt *rpt, llist_t *exc, -WEEKINDAYS ); r.until = date_sec_change( - update_time_in_date(nstart, 0, 0), + DAY(nstart), 0, r.freq * WEEKINDAYS ); @@ -1840,7 +1838,7 @@ int recur_nth_occurrence(time_t s, long d, struct rpt *r, llist_t *e, int n, return 0; for (n--, *nth = s; n > 0; n--) { - day = update_time_in_date(*nth, 0, 0); + day = DAY(*nth); if (!recur_next_occurrence(s, d, r, e, day, nth)) break; } @@ -1856,13 +1854,13 @@ int recur_prev_occurrence(time_t s, long d, struct rpt *r, llist_t *e, { time_t prev_day, next; - if (day <= update_time_in_date(s, 0, 0)) + if (day <= DAY(s)) return 0; next = *prev = s; - while (update_time_in_date(next, 0, 0) < day) { + while (DAY(next) < day) { /* Set new previous and next. */ *prev = next; - prev_day = update_time_in_date(*prev, 0, 0); + prev_day = DAY(*prev); recur_next_occurrence(s, d, r, e, prev_day, &next); /* Multi-day appointment */ if (next == *prev) -- cgit v1.2.3-54-g00ecf