From: Bastian Dehn Date: Sun, 9 Jun 2024 15:39:12 +0000 (+0200) Subject: change weekday with day number X-Git-Tag: 1.0.0^2~36 X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=bb973be8ca898bf82f3e9542f85ef43869fda80b;p=feierabend.git change weekday with day number --- diff --git a/src/time_format.c b/src/time_format.c index 7480426..b419e14 100644 --- a/src/time_format.c +++ b/src/time_format.c @@ -15,13 +15,9 @@ void get_time_str(time_t time, char* timestr) sprintf(timestr, "%02d:%02d", time_cal.tm_hour, time_cal.tm_min); } -void get_weekday(time_t time, char* weekday) +void get_weekday(int wday, char* weekday) { - struct tm weekday_num; - localtime_r(&time, &weekday_num); - - - switch (weekday_num.tm_wday) { + switch (wday) { case 0: sprintf(weekday, "%s", "Sonntag"); break; diff --git a/src/time_format.h b/src/time_format.h index 8cf0e7d..2f6364b 100644 --- a/src/time_format.h +++ b/src/time_format.h @@ -3,6 +3,6 @@ #include void get_time_str(time_t time, char* timestr); -void get_weekday(time_t time, char* weekday); +void get_weekday(int wday, char* weekday); #endif \ No newline at end of file diff --git a/tests/time_format_tests.c b/tests/time_format_tests.c index 2c7d664..d0b20d7 100644 --- a/tests/time_format_tests.c +++ b/tests/time_format_tests.c @@ -53,9 +53,8 @@ void get_thursday() { char* weekday = malloc(sizeof(char) * 11); memset(weekday, 0, 11); - time_t day = 0; - get_weekday(day, weekday); + get_weekday(4, weekday); assert_string_equal(weekday, "Donnerstag"); @@ -67,9 +66,8 @@ void get_friday() { char* weekday = malloc(sizeof(char) * 11); memset(weekday, 0, 11); - time_t day = 86400; - get_weekday(day, weekday); + get_weekday(5, weekday); assert_string_equal(weekday, "Freitag"); @@ -81,9 +79,8 @@ void get_saturday() { char* weekday = malloc(sizeof(char) * 11); memset(weekday, 0, 11); - time_t day = 172800; - get_weekday(day, weekday); + get_weekday(6, weekday); assert_string_equal(weekday, "Samstag"); @@ -95,9 +92,8 @@ void get_sunday() { char* weekday = malloc(sizeof(char) * 11); memset(weekday, 0, 11); - time_t day = 259200; - get_weekday(day, weekday); + get_weekday(0, weekday); assert_string_equal(weekday, "Sonntag"); @@ -109,9 +105,8 @@ void get_monday() { char* weekday = malloc(sizeof(char) * 11); memset(weekday, 0, 11); - time_t day = 345600; - get_weekday(day, weekday); + get_weekday(1, weekday); assert_string_equal(weekday, "Montag"); @@ -123,9 +118,8 @@ void get_thuesday() { char* weekday = malloc(sizeof(char) * 11); memset(weekday, 0, 11); - time_t day = 432000; - get_weekday(day, weekday); + get_weekday(2, weekday); assert_string_equal(weekday, "Dienstag"); @@ -137,9 +131,8 @@ void get_wednesday() { char* weekday = malloc(sizeof(char) * 11); memset(weekday, 0, 11); - time_t day = 518400; - get_weekday(day, weekday); + get_weekday(3, weekday); assert_string_equal(weekday, "Mittwoch");