From 791359fe0eae83641f0929159d5861359d395e97 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue, 14 Oct 2008 15:44:29 +0000
Subject: [PATCH] Fix EncodeSpecialTimestamp to throw error on unrecognized
input, rather than returning a failure code that none of its callers bothered
to check for.
---
src/backend/utils/adt/timestamp.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c
index acfc89ba04..7f80fc9421 100644
--- a/src/backend/utils/adt/timestamp.c
+++ b/src/backend/utils/adt/timestamp.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.192 2008/09/11 15:27:30 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.193 2008/10/14 15:44:29 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -64,7 +64,7 @@ typedef struct
static TimeOffset time2t(const int hour, const int min, const int sec, const fsec_t fsec);
-static int EncodeSpecialTimestamp(Timestamp dt, char *str);
+static void EncodeSpecialTimestamp(Timestamp dt, char *str);
static Timestamp dt2local(Timestamp dt, int timezone);
static void AdjustTimestampForTypmod(Timestamp *time, int32 typmod);
static void AdjustIntervalForTypmod(Interval *interval, int32 typmod);
@@ -1150,18 +1150,16 @@ AdjustIntervalForTypmod(Interval *interval, int32 typmod)
/* EncodeSpecialTimestamp()
* Convert reserved timestamp data type to string.
*/
-static int
+static void
EncodeSpecialTimestamp(Timestamp dt, char *str)
{
if (TIMESTAMP_IS_NOBEGIN(dt))
strcpy(str, EARLY);
else if (TIMESTAMP_IS_NOEND(dt))
strcpy(str, LATE);
- else
- return FALSE;
-
- return TRUE;
-} /* EncodeSpecialTimestamp() */
+ else /* shouldn't happen */
+ elog(ERROR, "invalid argument for EncodeSpecialTimestamp");
+}
Datum
now(PG_FUNCTION_ARGS)