aboutsummaryrefslogtreecommitdiff
path: root/src/timezone/ialloc.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2016-07-19 15:59:36 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2016-07-19 15:59:36 -0400
commit19d477aa681b4927f95824d724a4197c696f8c75 (patch)
tree4795da77200eb86060bef5e637190e03de6081a4 /src/timezone/ialloc.c
parentbdeed0944fadff3ea394d361d0137997fb4db953 (diff)
downloadpostgresql-19d477aa681b4927f95824d724a4197c696f8c75.tar.gz
postgresql-19d477aa681b4927f95824d724a4197c696f8c75.zip
Sync back-branch copies of the timezone code with IANA release tzcode2016c.
Back-patch commit 1c1a7cbd6a1600c9, along with subsequent portability fixes, into all active branches. Also, back-patch commits 696027727 and 596857043 (addition of zic -P option) into 9.1 and 9.2, just to reduce differences between the branches. src/timezone/ is now largely identical in all active branches, except that in 9.1, pgtz.c retains the initial-timezone-selection code that was moved over to initdb in 9.2. Ordinarily we wouldn't risk this much code churn in back branches, but it seems necessary in this case, because among the changes are two feature additions in the "zic" zone data file compiler (a larger limit on the number of allowed DST transitions, and addition of a "%z" escape in zone abbreviations). IANA have not yet started to use those features in their tzdata files, but presumably they will before too long. If we don't update then we'll be unable to adopt new timezone data. Also, installations built with --with-system-tzdata (which includes most distro-supplied builds, I believe) might fail even if we don't update our copies of the data files. There are assorted bug fixes too, mostly affecting obscure timezones or post-2037 dates. Discussion: <13601.1468868947@sss.pgh.pa.us>
Diffstat (limited to 'src/timezone/ialloc.c')
-rw-r--r--src/timezone/ialloc.c76
1 files changed, 0 insertions, 76 deletions
diff --git a/src/timezone/ialloc.c b/src/timezone/ialloc.c
deleted file mode 100644
index 05faafe262f..00000000000
--- a/src/timezone/ialloc.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * This file is in the public domain, so clarified as of
- * 2006-07-17 by Arthur David Olson.
- *
- * IDENTIFICATION
- * src/timezone/ialloc.c
- */
-
-#include "postgres_fe.h"
-
-#include "private.h"
-
-
-#define nonzero(n) (((n) == 0) ? 1 : (n))
-
-char *
-imalloc(int n)
-{
- return malloc((size_t) nonzero(n));
-}
-
-char *
-icalloc(int nelem, int elsize)
-{
- if (nelem == 0 || elsize == 0)
- nelem = elsize = 1;
- return calloc((size_t) nelem, (size_t) elsize);
-}
-
-void *
-irealloc(void *pointer, int size)
-{
- if (pointer == NULL)
- return imalloc(size);
- return realloc((void *) pointer, (size_t) nonzero(size));
-}
-
-char *
-icatalloc(char *old, const char *new)
-{
- char *result;
- int oldsize,
- newsize;
-
- newsize = (new == NULL) ? 0 : strlen(new);
- if (old == NULL)
- oldsize = 0;
- else if (newsize == 0)
- return old;
- else
- oldsize = strlen(old);
- if ((result = irealloc(old, oldsize + newsize + 1)) != NULL)
- if (new != NULL)
- (void) strcpy(result + oldsize, new);
- return result;
-}
-
-char *
-icpyalloc(const char *string)
-{
- return icatalloc((char *) NULL, string);
-}
-
-void
-ifree(char *p)
-{
- if (p != NULL)
- (void) free(p);
-}
-
-void
-icfree(char *p)
-{
- if (p != NULL)
- (void) free(p);
-}