From 0a13d304654a63c53f9cffdcd8941b92f3a445fe Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Fri, 22 Apr 2011 01:10:40 +0200 Subject: Also use the correct time for the ddate module --- src/print_ddate.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/print_ddate.c b/src/print_ddate.c index 16923b2..453e5a2 100644 --- a/src/print_ddate.c +++ b/src/print_ddate.c @@ -164,15 +164,10 @@ int format_output(char *format, struct disc_time *dt) { } /* Get the current date and convert it to discordian */ -struct disc_time *get_ddate() { - time_t current_time; - struct tm *current_tm; +struct disc_time *get_ddate(struct tm *current_tm) { static struct disc_time dt; - if ((current_time = time(NULL)) == (time_t)-1) - return NULL; - - if ((current_tm = localtime(¤t_time)) == NULL) + if (current_tm == NULL) return NULL; /* We have to know, whether we have to insert St. Tib's Day, so whether it's a leap @@ -197,10 +192,10 @@ struct disc_time *get_ddate() { return &dt; } -void print_ddate(const char *format) { +void print_ddate(const char *format, struct tm *current_tm) { static char *form = NULL; struct disc_time *dt; - if ((dt = get_ddate()) == NULL) + if ((dt = get_ddate(current_tm)) == NULL) return; if (form == NULL) if ((form = malloc(strlen(format) + 1)) == NULL) -- cgit v1.2.3