nstrftime: simplify test for mktime failure

* lib/nstrftime.c (__strftime_internal): Simplify.

diff --git a/ChangeLog b/ChangeLog
index bbf379b8c7da6c915a31adf2b2883a5d69e672c7..cd9d8b83b9f80a42d0bc903ad43133abe7de05c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-11-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+       nstrftime: simplify test for mktime failure
+       * lib/nstrftime.c (__strftime_internal): Simplify.
+
 2018-11-02  Paul Eggert  <eggert@cs.ucla.edu>
 
        gnulib-common.m4: port _Noreturn to C++

diff --git a/lib/nstrftime.c b/lib/nstrftime.c
index e55cfda0a35c47af470a83201d63a52b3ee56b00..61ac84b0ddfb979e5ebc0dc8b796d8793849cc66 100644 (file)
--- a/lib/nstrftime.c
+++ b/lib/nstrftime.c
@@ -1438,28 +1438,10 @@ __strftime_internal (STREAM_OR_CHAR_T *s, STRFTIME_ARG (size_t maxsize)
 # endif
 
                 ltm = *tp;
+                ltm.tm_wday = -1;
                 lt = mktime_z (tz, &ltm);
-
-                if (lt == (time_t) -1)
-                  {
-                    /* mktime returns -1 for errors, but -1 is also a
-                       valid time_t value.  Check whether an error really
-                       occurred.  */
-                    struct tm tm;
-
-                    if (! localtime_rz (tz, &lt, &tm)
-                        || ((ltm.tm_sec ^ tm.tm_sec)
-                            | (ltm.tm_min ^ tm.tm_min)
-                            | (ltm.tm_hour ^ tm.tm_hour)
-                            | (ltm.tm_mday ^ tm.tm_mday)
-                            | (ltm.tm_mon ^ tm.tm_mon)
-                            | (ltm.tm_year ^ tm.tm_year)))
-                      break;
-                  }
-
-                if (! localtime_rz (0, &lt, &gtm))
+                if (ltm.tm_wday < 0 || ! localtime_rz (0, &lt, &gtm))
                   break;
-
                 diff = tm_diff (&ltm, &gtm);
               }
 #endif