1
0
mirror of https://github.com/postgres/postgres.git synced 2025-08-18 12:22:09 +03:00

Sync our copy of the timezone library with IANA release tzcode2017c.

This is a trivial update containing only cosmetic changes.  The point
is just to get back to being synced with an official release of tzcode,
rather than some ad-hoc point in their commit history, which is where
commit 47f849a3c left it.
This commit is contained in:
Tom Lane
2017-10-23 17:54:09 -04:00
parent f3ea3e3e82
commit 24a1897ab9
5 changed files with 20 additions and 19 deletions

View File

@@ -119,8 +119,7 @@ static char *_yconv(int, int, bool, bool, char *, const char *);
size_t
pg_strftime(char *s, size_t maxsize, const char *format,
const struct pg_tm *t)
pg_strftime(char *s, size_t maxsize, const char *format, const struct pg_tm *t)
{
char *p;
enum warn warn = IN_NONE;
@@ -228,9 +227,9 @@ _fmt(const char *format, const struct pg_tm *t, char *pt,
case 'k':
/*
* This used to be... _conv(t->tm_hour % 12 ? t->tm_hour
* % 12 : 12, 2, ' '); ...and has been changed to the
* below to match SunOS 4.1.1 and Arnold Robbins' strftime
* This used to be... _conv(t->tm_hour % 12 ? t->tm_hour %
* 12 : 12, 2, ' '); ...and has been changed to the below
* to match SunOS 4.1.1 and Arnold Robbins' strftime
* version 3.0. That is, "%k" and "%l" have been swapped.
* (ado, 1993-05-24)
*/
@@ -248,7 +247,7 @@ _fmt(const char *format, const struct pg_tm *t, char *pt,
case 'l':
/*
* This used to be... _conv(t->tm_hour, 2, ' '); ...and
* This used to be... _conv(t->tm_hour, 2, ' '); ...and
* has been changed to the below to match SunOS 4.1.1 and
* Arnold Robbin's strftime version 3.0. That is, "%k" and
* "%l" have been swapped. (ado, 1993-05-24)
@@ -312,7 +311,7 @@ _fmt(const char *format, const struct pg_tm *t, char *pt,
* (01-53)."
* (ado, 1993-05-24)
*
* From <http://www.ft.uni-erlangen.de/~mskuhn/iso-time.html> by Markus Kuhn:
* From <https://www.cl.cam.ac.uk/~mgk25/iso-time.html> by Markus Kuhn:
* "Week 01 of a year is per definition the first week which has the
* Thursday in this year, which is equivalent to the week which contains
* the fourth day of January. In other words, the first week of a new year
@@ -482,7 +481,7 @@ _fmt(const char *format, const struct pg_tm *t, char *pt,
/*
* X311J/88-090 (4.12.3.5): if conversion char is
* undefined, behavior is undefined. Print out the
* undefined, behavior is undefined. Print out the
* character itself as printf(3) also does.
*/
default: