Commit 7d32551a authored by Michael Meskes's avatar Michael Meskes

Fixed some bugs in Informix compat functions.

parent 764f72dc
...@@ -443,7 +443,12 @@ rtoday (Date *d) ...@@ -443,7 +443,12 @@ rtoday (Date *d)
int int
rjulmdy (Date d, short mdy[3]) rjulmdy (Date d, short mdy[3])
{ {
PGTYPESdate_julmdy(d, (int *)mdy); int mdy_int[3];
PGTYPESdate_julmdy(d, mdy_int);
mdy[0] = (short)mdy_int[0];
mdy[1] = (short)mdy_int[1];
mdy[2] = (short)mdy_int[2];
return 0; return 0;
} }
...@@ -482,7 +487,12 @@ rfmtdate (Date d, char *fmt, char *str) ...@@ -482,7 +487,12 @@ rfmtdate (Date d, char *fmt, char *str)
int int
rmdyjul (short mdy[3], Date *d) rmdyjul (short mdy[3], Date *d)
{ {
PGTYPESdate_mdyjul((int *)mdy, d); int mdy_int[3];
mdy_int[0] = mdy[0];
mdy_int[1] = mdy[1];
mdy_int[2] = mdy[2];
PGTYPESdate_mdyjul(mdy_int, d);
return 0; return 0;
} }
......
/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/misc.c,v 1.9 2003/07/01 12:40:51 meskes Exp $ */ /* $Header: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/misc.c,v 1.10 2003/07/17 07:54:29 meskes Exp $ */
#define POSTGRES_ECPG_INTERNAL #define POSTGRES_ECPG_INTERNAL
#include "postgres_fe.h" #include "postgres_fe.h"
...@@ -308,7 +308,7 @@ ECPGset_informix_null(enum ECPGttype type, void *ptr) ...@@ -308,7 +308,7 @@ ECPGset_informix_null(enum ECPGttype type, void *ptr)
static bool _check(unsigned char *ptr, int length) static bool _check(unsigned char *ptr, int length)
{ {
for (;ptr[length] == 0xff && length >= 0; length --); for (;ptr[--length] == 0xff && length >= 0; length --);
if (length < 0) return true; if (length < 0) return true;
return false; return false;
} }
......
...@@ -101,9 +101,9 @@ PGTYPESdate_julmdy(Date jd, int* mdy) ...@@ -101,9 +101,9 @@ PGTYPESdate_julmdy(Date jd, int* mdy)
int y, m, d; int y, m, d;
j2date((int) jd, &y, &m, &d); j2date((int) jd, &y, &m, &d);
mdy[0] = (short int) m; mdy[0] = m;
mdy[1] = (short int) d; mdy[1] = d;
mdy[2] = (short int) y; mdy[2] = y;
} }
void void
......
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