From 3c59faa925066f5acec45ed197785a09210875cf Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Fri, 11 Nov 2011 09:30:29 +0100 Subject: Use a dynamic method to print recurrent items to stdout Add print_recur_apoint() and print_recur_event() helper functions to print recurrent items to stdout and use them everywhere. Currently, these are only wrapper functions to print_apoint() and print_event() that create temporary, non-recurrent items. Signed-off-by: Lukas Fleischer --- src/args.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/args.c') diff --git a/src/args.c b/src/args.c index d27a575..a944513 100644 --- a/src/args.c +++ b/src/args.c @@ -385,9 +385,7 @@ app_arg (int add_line, struct date *day, long date, int print_note, arg_print_date (today); print_date = 0; } - fputs (" * ", stdout); - fputs (re->mesg, stdout); - fputs ("\n", stdout); + print_recur_event (" * %m\n", today, re); if (print_note && re->note) print_notefile (stdout, re->note, 2); } @@ -482,10 +480,8 @@ app_arg (int add_line, struct date *day, long date, int print_note, arg_print_date (today); print_date = 0; } - apt = apoint_recur_s2apoint_s (ra); - print_apoint (" - %S -> %E\n\t%m\n", today, apt); - mem_free (apt->mesg); - mem_free (apt); + recur_apoint_find_occurrence (ra, today, &occurrence); + print_recur_apoint (" - %S -> %E\n\t%m\n", today, occurrence, ra); if (print_note && ra->note) print_notefile (stdout, ra->note, 2); apt = NULL; -- cgit v1.2.3-54-g00ecf