Use "struct rpt" to shorten argument lists

Also, prepare for extension of the structure, shorten names and
rearrange comments.

Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lars Henriksen
2019-05-22 09:04:36 +02:00
committed by Lukas Fleischer
parent e9deb6fff3
commit 3f7bd331c8
4 changed files with 79 additions and 96 deletions

View File

@@ -56,24 +56,22 @@ typedef void (*cb_dump_t) (FILE *, long, long, char *);
*/
static void
foreach_date_dump(const long date_end, struct rpt *rpt, llist_t * exc,
long item_first_date, long item_dur, char *item_mesg,
long item_start, long item_dur, char *item_mesg,
cb_dump_t cb_dump, FILE * stream)
{
long date, item_time;
struct tm lt;
time_t t;
t = item_first_date;
t = item_start;
localtime_r(&t, &lt);
lt.tm_hour = lt.tm_min = lt.tm_sec = 0;
lt.tm_isdst = -1;
date = mktime(&lt);
item_time = item_first_date - date;
item_time = item_start - date;
while (date <= date_end && date <= rpt->until) {
if (recur_item_inday
(item_first_date, item_dur, exc, rpt->type, rpt->freq,
rpt->until, date)) {
if (recur_item_inday(item_start, item_dur, rpt, exc, date)) {
(*cb_dump) (stream, date + item_time, item_dur,
item_mesg);
}