X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fprint_time.c;h=5133c5108b9ffded80b7a1050d8038f8c5c1b18a;hb=0e4fd9ad4a4cc7d6c770134a077e91b02f6cd2f0;hp=c124e1a7223624366ab2f4acce716eb967175ef4;hpb=ac6c2a7d46603202be3a4f4d677f0be274d15e23;p=i3%2Fi3status diff --git a/src/print_time.c b/src/print_time.c index c124e1a..5133c51 100644 --- a/src/print_time.c +++ b/src/print_time.c @@ -1,4 +1,5 @@ // vim:ts=4:sw=4:expandtab +#include #include #include #include @@ -34,7 +35,7 @@ void set_timezone(const char *tz) { tzset(); } -void print_time(yajl_gen json_gen, char *buffer, const char *title, const char *format, const char *tz, const char *locale, const char *format_time, bool only_when_tz_different, time_t t) { +void print_time(yajl_gen json_gen, char *buffer, const char *title, const char *format, const char *tz, const char *locale, const char *format_time, bool hide_if_equals_localtime, time_t t) { const char *walk; char *outwalk = buffer; struct tm local_tm, tm; @@ -49,11 +50,11 @@ void print_time(yajl_gen json_gen, char *buffer, const char *title, const char * set_timezone(tz); localtime_r(&t, &tm); - // When only_when_tz_different is true, compare local and target time to display only if different + // When hide_if_equals_localtime is true, compare local and target time to display only if different time_t local_t = mktime(&local_tm); double diff = difftime(local_t, t); - if (only_when_tz_different && diff == 0.0) { - return; + if (hide_if_equals_localtime && diff == 0.0) { + goto out; } if (locale != NULL) { @@ -83,6 +84,7 @@ void print_time(yajl_gen json_gen, char *buffer, const char *title, const char * setlocale(LC_ALL, ""); } +out: *outwalk = '\0'; OUTPUT_FULL_TEXT(buffer); }