diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2008-02-16 21:16:04 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2008-02-16 21:16:04 +0000 |
| commit | 0171e72d4da2da7974ff13c63130e2175cebee88 (patch) | |
| tree | c7cbf0a5a943ddbe374b3b838f3679be1f1c0014 /src/timezone/scheck.c | |
| parent | 2f67722dda9a46e82bad6807a12401dd7839910c (diff) | |
| download | postgresql-0171e72d4da2da7974ff13c63130e2175cebee88.tar.gz postgresql-0171e72d4da2da7974ff13c63130e2175cebee88.zip | |
Update timezone code to track the upstream changes since 2003. In particular
this adds support for 64-bit tzdata files, which is needed to support DST
calculations beyond 2038. Add a regression test case to give some minimal
confidence that that really works.
Heikki Linnakangas
Diffstat (limited to 'src/timezone/scheck.c')
| -rw-r--r-- | src/timezone/scheck.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/timezone/scheck.c b/src/timezone/scheck.c index 230fefc6c43..acc4cb5bc87 100644 --- a/src/timezone/scheck.c +++ b/src/timezone/scheck.c @@ -1,9 +1,9 @@ /* * This file is in the public domain, so clarified as of - * 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov). + * 2006-07-17 by Arthur David Olson. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/timezone/scheck.c,v 1.8 2007/10/26 13:30:10 tgl Exp $ + * $PostgreSQL: pgsql/src/timezone/scheck.c,v 1.9 2008/02/16 21:16:04 tgl Exp $ */ #include "postgres_fe.h" @@ -11,18 +11,17 @@ #include "private.h" -char * +const char * scheck(const char *string, const char *format) { char *fbuf; const char *fp; char *tp; int c; - char *result; + const char *result; char dummy; - static char nada; - result = &nada; + result = ""; if (string == NULL || format == NULL) return result; fbuf = imalloc((int) (2 * strlen(format) + 4)); |