mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix EncodeSpecialTimestamp to throw error on unrecognized input, rather than

Browse Source 
returning a failure code that none of its callers bothered to check for.
This commit is contained in:
Tom Lane 2008-10-14 15:44:29 +00:00
parent f346a232ed
commit 791359fe0e
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/backend/utils/adt/timestamp.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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 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 Timestamp dt2local(Timestamp dt, int timezone);
static void AdjustTimestampForTypmod(Timestamp *time, int32 typmod); static void AdjustTimestampForTypmod(Timestamp *time, int32 typmod);
static void AdjustIntervalForTypmod(Interval *interval, int32 typmod); static void AdjustIntervalForTypmod(Interval *interval, int32 typmod);
@ -1150,18 +1150,16 @@ AdjustIntervalForTypmod(Interval *interval, int32 typmod)
/* EncodeSpecialTimestamp() /* EncodeSpecialTimestamp()
* Convert reserved timestamp data type to string. * Convert reserved timestamp data type to string.
*/ */
static int static void
EncodeSpecialTimestamp(Timestamp dt, char *str) EncodeSpecialTimestamp(Timestamp dt, char *str)
{ {
if (TIMESTAMP_IS_NOBEGIN(dt)) if (TIMESTAMP_IS_NOBEGIN(dt))
strcpy(str, EARLY); strcpy(str, EARLY);
else if (TIMESTAMP_IS_NOEND(dt)) else if (TIMESTAMP_IS_NOEND(dt))
strcpy(str, LATE); strcpy(str, LATE);
else else /* shouldn't happen */
return FALSE; elog(ERROR, "invalid argument for EncodeSpecialTimestamp");
}
return TRUE;
} /* EncodeSpecialTimestamp() */
Datum Datum
now(PG_FUNCTION_ARGS) now(PG_FUNCTION_ARGS)