Skip to content

P
Postgres FD Implementation
Commit aae7b190 authored by Bruce Momjian's avatar Bruce Momjian
Browse files
Options

Update DATEDEBUG removal.

parent a8587d02
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 8 deletions
src/backend/utils/adt/dt.c
View file @ aae7b190
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.78 2000/01/02 01:37:27 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.79 2000/01/02 02:32:37 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -322,6 +322,7 @@ GetEpochTime(struct tm * tm) ...@@ -322,6 +322,7 @@ GetEpochTime(struct tm * tm)
tm->tm_min = t0->tm_min; tm->tm_min = t0->tm_min;
tm->tm_sec = t0->tm_sec; tm->tm_sec = t0->tm_sec;
if (tm->tm_year < 1900)
tm->tm_year += 1900; tm->tm_year += 1900;
tm->tm_mon++; tm->tm_mon++;
...@@ -2310,7 +2311,6 @@ datetime2tm(DateTime dt, int *tzp, struct tm * tm, double *fsec, char **tzn) ...@@ -2310,7 +2311,6 @@ datetime2tm(DateTime dt, int *tzp, struct tm * tm, double *fsec, char **tzn)
#ifdef USE_POSIX_TIME #ifdef USE_POSIX_TIME
tx = localtime(&utime); tx = localtime(&utime);
#endif
tm->tm_year = tx->tm_year + 1900; tm->tm_year = tx->tm_year + 1900;
tm->tm_mon = tx->tm_mon + 1; tm->tm_mon = tx->tm_mon + 1;
tm->tm_mday = tx->tm_mday; tm->tm_mday = tx->tm_mday;
...@@ -3288,7 +3288,6 @@ DecodeNumber(int flen, char *str, int fmask, ...@@ -3288,7 +3288,6 @@ DecodeNumber(int flen, char *str, int fmask,
} }
tm->tm_year = val; tm->tm_year = val;
} }
/* already have year? then could be month */ /* already have year? then could be month */
else if ((fmask & DTK_M(YEAR)) && (!(fmask & DTK_M(MONTH))) else if ((fmask & DTK_M(YEAR)) && (!(fmask & DTK_M(MONTH)))
...@@ -3296,7 +3295,6 @@ DecodeNumber(int flen, char *str, int fmask, ...@@ -3296,7 +3295,6 @@ DecodeNumber(int flen, char *str, int fmask,
{ {
*tmask = DTK_M(MONTH); *tmask = DTK_M(MONTH);
tm->tm_mon = val; tm->tm_mon = val;
/* no year and EuroDates enabled? then could be day */ /* no year and EuroDates enabled? then could be day */
} }
else if ((EuroDates || (fmask & DTK_M(MONTH))) else if ((EuroDates || (fmask & DTK_M(MONTH)))
...@@ -3305,14 +3303,12 @@ DecodeNumber(int flen, char *str, int fmask, ...@@ -3305,14 +3303,12 @@ DecodeNumber(int flen, char *str, int fmask,
{ {
*tmask = DTK_M(DAY); *tmask = DTK_M(DAY);
tm->tm_mday = val; tm->tm_mday = val;
} }
else if ((!(fmask & DTK_M(MONTH))) else if ((!(fmask & DTK_M(MONTH)))
&& ((val >= 1) && (val <= 12))) && ((val >= 1) && (val <= 12)))
{ {
*tmask = DTK_M(MONTH); *tmask = DTK_M(MONTH);
tm->tm_mon = val; tm->tm_mon = val;
} }
else if ((!(fmask & DTK_M(DAY))) else if ((!(fmask & DTK_M(DAY)))
&& ((val >= 1) && (val <= 31))) && ((val >= 1) && (val <= 31)))
...@@ -3354,7 +3350,6 @@ DecodeNumberField(int len, char *str, int fmask, ...@@ -3354,7 +3350,6 @@ DecodeNumberField(int len, char *str, int fmask,
tm->tm_mon = atoi(str + 4); tm->tm_mon = atoi(str + 4);
*(str + 4) = '\0'; *(str + 4) = '\0';
tm->tm_year = atoi(str + 0); tm->tm_year = atoi(str + 0);
/* yymmdd or hhmmss? */ /* yymmdd or hhmmss? */
} }
else if (len == 6) else if (len == 6)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment