Update timezone code from tzcode 2018i.

This patch updates files coming from tzcode to the versions in tzcode
2018i.  No changes elsewhere in glibc were needed.

Tested for x86_64.

	* timezone/zdump.c: Update from tzcode 2018i.
	* timezone/zic.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 5f29a301148a9e600edafae126bc90f04206eef6..9dc753d49f9d492e27fdb71dd68e45555369e4e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-12-31  Joseph Myers  <joseph@codesourcery.com>
+
+       * timezone/zdump.c: Update from tzcode 2018i.
+       * timezone/zic.c: Likewise.
+
 2018-12-31  Paul Eggert  <eggert@cs.ucla.edu>
 
        regex: improve Gnulib port to AIX

diff --git a/timezone/zdump.c b/timezone/zdump.c
index 608f288691fce85ec9e0abbf1d98360b897d3f5f..0fc8ced96ae0439464e93089f28ac6e2635d994e 100644 (file)
--- a/timezone/zdump.c
+++ b/timezone/zdump.c
@@ -807,8 +807,10 @@ my_snprintf(char *s, size_t size, char const *format, ...)
     arglen = strlen(arg);
   } else {
     n = vsprintf(buf, format, args);
-    if (n < 0)
+    if (n < 0) {
+      va_end(args);
       return n;
+    }
     arg = buf;
     arglen = n;
   }

diff --git a/timezone/zic.c b/timezone/zic.c
index cb1bf28bfbc83ba46d858c5467efd0eec2fa3764..2ebc66a9af5b4f813947c18d4399d1bb5302acc4 100644 (file)
--- a/timezone/zic.c
+++ b/timezone/zic.c
@@ -2741,7 +2741,7 @@ error(_("can't determine time zone abbreviation to use just after until time"));
                        if (attypes[i].at > lastat->at)
                                lastat = &attypes[i];
                if (lastat->at < rpytime(&xr, max_year - 1)) {
-                       addtt(rpytime(&xr, max_year + 1), typecnt-1);
+                       addtt(rpytime(&xr, max_year + 1), lastat->type);
                        attypes[timecnt - 1].dontmerge = true;
                }
        }
@@ -2945,7 +2945,7 @@ lowerit(char a)
 }
 
 /* case-insensitive equality */
-static bool
+static ATTRIBUTE_PURE bool
 ciequal(register const char *ap, register const char *bp)
 {
        while (lowerit(*ap) == lowerit(*bp++))
@@ -2954,7 +2954,7 @@ ciequal(register const char *ap, register const char *bp)
        return false;
 }
 
-static bool
+static ATTRIBUTE_PURE bool
 itsabbr(register const char *abbr, register const char *word)
 {
        if (lowerit(*abbr) != lowerit(*word))
@@ -2970,7 +2970,7 @@ itsabbr(register const char *abbr, register const char *word)
 
 /* Return true if ABBR is an initial prefix of WORD, ignoring ASCII case.  */
 
-static bool
+static ATTRIBUTE_PURE bool
 ciprefix(char const *abbr, char const *word)
 {
   do