OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Joseph Myers 2018-12-31 23:51:15 +00:00
parent 9b7f98b345
commit e740e5b1f0
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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

4
timezone/zdump.c
View File

@ -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;
}

8
timezone/zic.c
View File

@ -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