Skip to content

Commit 2877b10

Browse files
committed
Sync our copy of the timezone library with IANA release tzcode2016g.
This is mostly to absorb some corner-case fixes in zic for year-2037 timestamps. The other changes that have been made are unlikely to affect our usage, but nonetheless we may as well take 'em.
1 parent bca6d83 commit 2877b10

File tree

4 files changed

+250
-198
lines changed

4 files changed

+250
-198
lines changed

src/timezone/localtime.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1279,9 +1279,8 @@ gmtsub(pg_time_t const * timep, int32 offset, struct pg_tm * tmp)
12791279
result = timesub(timep, offset, gmtptr, tmp);
12801280

12811281
/*
1282-
* Could get fancy here and deliver something such as "UT+xxxx" or
1283-
* "UT-xxxx" if offset is non-zero, but this is no time for a treasure
1284-
* hunt.
1282+
* Could get fancy here and deliver something such as "+xx" or "-xx" if
1283+
* offset is non-zero, but this is no time for a treasure hunt.
12851284
*/
12861285
if (offset != 0)
12871286
tmp->tm_zone = wildabbr;

src/timezone/private.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
#include "pgtime.h"
2525

26+
/* This string was in the Factory zone through version 2016f. */
2627
#define GRANDPARENTED "Local time zone must be set--see zic manual page"
2728

2829
/*

src/timezone/strftime.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ pg_strftime(char *s, size_t maxsize, const char *format,
128128
int warn;
129129

130130
warn = IN_NONE;
131-
p = _fmt(((format == NULL) ? "%c" : format), t, s, s + maxsize, &warn);
131+
p = _fmt(format, t, s, s + maxsize, &warn);
132132
if (p == s + maxsize)
133133
return 0;
134134
*p = '\0';

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy