cvs: php-src /ext/interbase ibase_query.c

tony2001 Fri Mar 16 09:30:19 2007 UTC Modified files: /php-src/ext/interbase ibase_query.c Log: MFB: fix #40805 (Failure executing function ibase_execute()) http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/ibase_query.c?r1=1.31&r2=1.32&diff_format=u Index: php-src/ext/interbase/ibase_query.c diff -u php-src/ext/interbase/ibase_query.c:1.31 php-src/ext/interbase/ibase_query.c:1.32 --- php-src/ext/interbase/ibase_query.c:1.31 Sat Feb 24 16:25:54 2007 +++ php-src/ext/interbase/ibase_query.c Fri Mar 16 09:30:18 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ibase_query.c,v 1.31 2007/02/24 16:25:54 helly Exp $ */ +/* $Id: ibase_query.c,v 1.32 2007/03/16 09:30:18 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -669,13 +669,13 @@ var->sqldata = (void*)&buf[i].val; switch (var->sqltype & ~1) { - struct tm *t, tmbuf; + struct tm t, tmbuf; case SQL_TIMESTAMP: case SQL_TYPE_DATE: case SQL_TYPE_TIME: if (Z_TYPE_P(b_var) == IS_LONG) { - t = php_gmtime_r(&Z_LVAL_P(b_var), &tmbuf); + php_gmtime_r(&Z_LVAL_P(b_var), &t); } else { #ifdef HAVE_STRPTIME char *format = INI_STR("ibase.timestampformat"); @@ -689,7 +689,7 @@ case SQL_TYPE_TIME: format = INI_STR("ibase.timeformat"); } - if (!strptime(Z_STRVAL_P(b_var), format, t)) { + if (!strptime(Z_STRVAL_P(b_var), format, &t)) { /* strptime() cannot handle it, so let IB have a try */ break; } @@ -700,13 +700,13 @@ switch (var->sqltype & ~1) { default: /* == case SQL_TIMESTAMP */ - isc_encode_timestamp(t, &buf[i].val.tsval); + isc_encode_timestamp(&t, &buf[i].val.tsval); break; case SQL_TYPE_DATE: - isc_encode_sql_date(t, &buf[i].val.dtval); + isc_encode_sql_date(&t, &buf[i].val.dtval); break; case SQL_TYPE_TIME: - isc_encode_sql_time(t, &buf[i].val.tmval); + isc_encode_sql_time(&t, &buf[i].val.tmval); break; } continue;