From 921dc0153f95362d4eb49e30fb1960b8f1e92abc Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 16 Aug 2020 14:11:11 -0700 Subject: [PATCH] time_rz: remove unused functions * lib/time_rz.c (isdst_differ, equal_tm): Remove; no longer used. --- ChangeLog | 3 +++ lib/time_rz.c | 25 ------------------------- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2e4651751b..8d72748ba1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2020-08-16 Paul Eggert + time_rz: remove unused functions + * lib/time_rz.c (isdst_differ, equal_tm): Remove; no longer used. + time_rz: fix issues with mktime_z failures * lib/time_rz.c (mktime_z): Do not update *TM if revert_tz fails. Use a cheaper tm_yday test for failed mktime. diff --git a/lib/time_rz.c b/lib/time_rz.c index 8ed3c44433..c58e6831bf 100644 --- a/lib/time_rz.c +++ b/lib/time_rz.c @@ -54,31 +54,6 @@ enum { ABBR_SIZE_MIN = DEFAULT_MXFAST - offsetof (struct tm_zone, abbrs) }; matters; the pointer is never dereferenced. */ static timezone_t const local_tz = (timezone_t) 1; -#if HAVE_TM_ZONE || HAVE_TZNAME - -/* Return true if the values A and B differ according to the rules for - tm_isdst: A and B differ if one is zero and the other positive. */ -static bool -isdst_differ (int a, int b) -{ - return !a != !b && 0 <= a && 0 <= b; -} - -/* Return true if A and B are equal. */ -static int -equal_tm (const struct tm *a, const struct tm *b) -{ - return ! ((a->tm_sec ^ b->tm_sec) - | (a->tm_min ^ b->tm_min) - | (a->tm_hour ^ b->tm_hour) - | (a->tm_mday ^ b->tm_mday) - | (a->tm_mon ^ b->tm_mon) - | (a->tm_year ^ b->tm_year) - | isdst_differ (a->tm_isdst, b->tm_isdst)); -} - -#endif - /* Copy to ABBRS the abbreviation at ABBR with size ABBR_SIZE (this includes its trailing null byte). Append an extra null byte to mark the end of ABBRS. */ -- 2.39.5