From 24a1897ab92646795bf065aa1b9d266aba74469f Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Mon, 23 Oct 2017 17:54:09 -0400 Subject: 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. --- src/timezone/strftime.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/timezone/strftime.c') diff --git a/src/timezone/strftime.c b/src/timezone/strftime.c index e1c64834430..bb638c81a45 100644 --- a/src/timezone/strftime.c +++ b/src/timezone/strftime.c @@ -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 by Markus Kuhn: + * From 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: -- cgit v1.2.3