>From 46c02f2afe9321d3a252b6265588c7402d895c08 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 2 Sep 2015 07:45:30 -0700 Subject: [PROPOSED PATCH] Simplify strftime's use of tm_zone * NEWS: Document this. * strftime.c (_fmt) [TM_ZONE]: Don't worry about tm_zone being NULL, as it can't happen. This makes strftime.c behave more like zdump.c does. --- NEWS | 5 ++++- strftime.c | 7 +++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 92a549a..8cf9a9c 100644 --- a/NEWS +++ b/NEWS @@ -4,7 +4,7 @@ Unreleased, experimental changes Changes affecting future time stamps - Fiji's 2016 fall-back transition is scheduled for January 17, not January 24. + Fiji's 2016 fall-back transition is scheduled for January 17, not 24. (Thanks to Ken Rylander.) Changes affecting code @@ -15,6 +15,9 @@ Unreleased, experimental changes The localtime module allows the variables 'timezone', 'daylight', and 'altzone' to be in common storage shared with other modules. + On platforms with tm_zone, strftime.c now assumes it is not NULL. + This simplifies the code and is consistent with zdump.c. + Release 2015f - 2015-08-10 18:06:56 -0700 diff --git a/strftime.c b/strftime.c index 7c5e516..27af34a 100644 --- a/strftime.c +++ b/strftime.c @@ -473,13 +473,12 @@ label: continue; case 'Z': #ifdef TM_ZONE - if (t->TM_ZONE != NULL) - pt = _add(t->TM_ZONE, pt, ptlim); - else -#endif /* defined TM_ZONE */ + pt = _add(t->TM_ZONE, pt, ptlim); +#else if (t->tm_isdst >= 0) pt = _add(tzname[t->tm_isdst != 0], pt, ptlim); +#endif /* ** C99 says that %Z must be replaced by the ** empty string if the time zone is not -- 2.1.0