diff options
author | Ingo Bürk <admin@airblader.de> | 2018-11-17 16:28:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-17 16:28:38 +0100 |
commit | a84ad18fbfe2fa8d9280ca0ad3d131d9fd067afb (patch) | |
tree | b60d4c797e305fabd2213f93b244567e37e2beef /src | |
parent | 2d38178063d13dd3a1e477dadb31ebad53a2a471 (diff) | |
parent | 1b7501b7ea561404b2dd27297a4ccd7432db46f4 (diff) |
Merge pull request #321 from eplanet/autodisplay-tz
Add timezone switch
Diffstat (limited to 'src')
-rw-r--r-- | src/print_time.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/print_time.c b/src/print_time.c index 3a6c4cc..864aeae 100644 --- a/src/print_time.c +++ b/src/print_time.c @@ -34,18 +34,28 @@ 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, 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 tm; + struct tm local_tm, tm; char timebuf[1024]; if (title != NULL) INSTANCE(title); + set_timezone(NULL); + localtime_r(&t, &local_tm); + set_timezone(tz); localtime_r(&t, &tm); + // 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 (hide_if_equals_localtime && diff == 0.0) { + goto out; + } + if (locale != NULL) { setlocale(LC_ALL, locale); } @@ -73,6 +83,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); } |