aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils/misc/tzparser.c
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2023-11-24 22:36:23 -0500
committerBruce Momjian <bruce@momjian.us>2023-11-24 22:36:23 -0500
commit79588d3c8d08b8653dfc523d6ae5168652c6ff8a (patch)
treebc86211013076b78acdfd0fb2d87797e687c183a /src/backend/utils/misc/tzparser.c
parent9890a855ae82d2185c6dcd98f0071a0c889cacc3 (diff)
downloadpostgresql-79588d3c8d08b8653dfc523d6ae5168652c6ff8a.tar.gz
postgresql-79588d3c8d08b8653dfc523d6ae5168652c6ff8a.zip
Use SECS_PER_HOUR macro in tzparser.c, instead of constants
Reported-by: CharSyam Discussion: https://postgr.es/m/CAMrLSE5j_aWfoBDMrSvk14oBKSy+-2cjzNNH_FciirA7Kwo9TA@mail.gmail.com Author: CharSyam Backpatch-through: master
Diffstat (limited to 'src/backend/utils/misc/tzparser.c')
-rw-r--r--src/backend/utils/misc/tzparser.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/backend/utils/misc/tzparser.c b/src/backend/utils/misc/tzparser.c
index dfb0253150e..8da529de566 100644
--- a/src/backend/utils/misc/tzparser.c
+++ b/src/backend/utils/misc/tzparser.c
@@ -29,6 +29,7 @@
#include "utils/guc.h"
#include "utils/memutils.h"
#include "utils/tzparser.h"
+#include "utils/datetime.h"
#define WHITESPACE " \t\n\r"
@@ -66,8 +67,8 @@ validateTzEntry(tzEntry *tzentry)
/*
* Sanity-check the offset: shouldn't exceed 14 hours
*/
- if (tzentry->offset > 14 * 60 * 60 ||
- tzentry->offset < -14 * 60 * 60)
+ if (tzentry->offset > 14 * SECS_PER_HOUR ||
+ tzentry->offset < -14 * SECS_PER_HOUR)
{
GUC_check_errmsg("time zone offset %d is out of range in time zone file \"%s\", line %d",
tzentry->offset,
@@ -155,7 +156,7 @@ splitTzLine(const char *filename, int lineno, char *line, tzEntry *tzentry)
* zones that probably will never be used in the current session.
*/
tzentry->zone = pstrdup(offset);
- tzentry->offset = 0;
+ tzentry->offset = 0 * SECS_PER_HOUR;
tzentry->is_dst = false;
remain = strtok(NULL, WHITESPACE);
}