From afc8e7967d41a51f34688f8005a415f793c8f163 Mon Sep 17 00:00:00 2001 From: Ariadna Vigo Date: Thu, 24 Dec 2020 21:51:44 +0100 Subject: Split up printing routines --- cras.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/cras.c b/cras.c index 6034e6e..533fdf0 100644 --- a/cras.c +++ b/cras.c @@ -36,6 +36,7 @@ enum { static void die(const char *fmt, ...); static void printf_color(const char *ansi_color, const char *fmt, ...); static void print_task(Task task, int i); +static void print_task_list(TaskLst list); static void print_short_output(TaskLst list); static void print_output(TaskLst list); static void read_crasfile(TaskLst *list, const char *crasfile); @@ -100,20 +101,10 @@ print_task(Task task, int i) } static void -print_short_output(TaskLst list) +print_task_list(TaskLst list) { - printf_color(task_todo_color, "%d", task_lst_count_todo(list)); - printf("/"); - printf_color(task_done_color, "%d", task_lst_count_done(list)); -} - -static void -print_output(TaskLst list) -{ - int i; Task *ptr; - - printf("Due date: %s\n", ctime(&list.expiry)); + int i; for(i = 0, ptr = list.first; ptr != NULL; ptr = ptr->next) { print_task(*ptr, i); @@ -122,7 +113,21 @@ print_output(TaskLst list) if (i > 0) putchar('\n'); +} +static void +print_short_output(TaskLst list) +{ + printf_color(task_todo_color, "%d", task_lst_count_todo(list)); + printf("/"); + printf_color(task_done_color, "%d", task_lst_count_done(list)); +} + +static void +print_output(TaskLst list) +{ + printf("Due date: %s\n", ctime(&list.expiry)); + print_task_list(list); print_short_output(list); printf(" to do/done"); } -- cgit v1.2.3