From 7a2afa0583f4f4679beb7e73bfa63c47efc00aeb Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Thu, 21 Sep 2023 11:04:01 +0000 Subject: Fix [e368ba6683]: ThreadSafeLocalTime(): check if localtime_r() encountered error --- generic/tclClock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generic/tclClock.c b/generic/tclClock.c index 194cfb3..ecf5913 100644 --- a/generic/tclClock.c +++ b/generic/tclClock.c @@ -1714,7 +1714,7 @@ ThreadSafeLocalTime( struct tm *tmPtr = (struct tm *)Tcl_GetThreadData(&tmKey, sizeof(struct tm)); #ifdef HAVE_LOCALTIME_R - localtime_r(timePtr, tmPtr); + tmPtr = localtime_r(timePtr, tmPtr); #else struct tm *sysTmPtr; -- cgit v0.12 From 5236d11a8865a2e51fe97abfadea3a0d6b2a7030 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Thu, 21 Sep 2023 11:06:57 +0000 Subject: Fix [47902ec47a]: ThreadSafeLocalTime(): remove redundant localtime() call --- generic/tclClock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generic/tclClock.c b/generic/tclClock.c index ecf5913..38c4ec0 100644 --- a/generic/tclClock.c +++ b/generic/tclClock.c @@ -1724,7 +1724,7 @@ ThreadSafeLocalTime( Tcl_MutexUnlock(&clockMutex); return NULL; } - memcpy(tmPtr, localtime(timePtr), sizeof(struct tm)); + memcpy(tmPtr, sysTmPtr, sizeof(struct tm)); Tcl_MutexUnlock(&clockMutex); #endif return tmPtr; -- cgit v0.12 From 8c63cf83ec217d6dad91da1b16b7357bbc512860 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Thu, 21 Sep 2023 11:10:34 +0000 Subject: Fix testcase for [00655c867e] (making it independent from timezone) --- tests/clock.test | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/clock.test b/tests/clock.test index 4b12d5c..98a065e 100644 --- a/tests/clock.test +++ b/tests/clock.test @@ -18605,10 +18605,10 @@ test clock-7.10 {Julian Day, negative amount} { # add negative amounts to Julian day 0 instead set s0 [clock scan 0 -format %J -gmt true] set J0 [scan [clock format $s0 -format %J -gmt true] %lld] - set s0m1d [clock add $s0 -1 days] - set s0m24h [clock add $s0 -24 hours] + set s0m1d [clock add $s0 -1 days -timezone :UTC] + set s0m24h [clock add $s0 -24 hours -timezone :UTC] set J0m24h [scan [clock format $s0m24h -format %J -gmt true] %lld] - set s0m1s [clock add $s0 -1 seconds] + set s0m1s [clock add $s0 -1 seconds -timezone :UTC] set J0m1s [scan [clock format $s0m1s -format %J -gmt true] %lld] list $s0m1d $s0m24h $J0m24h $s0m1s $J0m1s $s0 $J0 \ [::tcl::mathop::== $s0m1d $s0m24h] [::tcl::mathop::== $J0m24h $J0m1s] -- cgit v0.12