cvs: php-src(PHP_5_2) /ext/interbase ibase_query.c

tony2001 Thu Mar 15 22:33:04 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/interbase ibase_query.c Log: fix #40805 (Failure executing function ibase_execute()) http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/ibase_query.c?r1=1.23.2.1.2.8&r2=1.23.2.1.2.9&diff_format=u Index: php-src/ext/interbase/ibase_query.c diff -u php-src/ext/interbase/ibase_query.c:1.23.2.1.2.8 php-src/ext/interbase/ibase_query.c:1.23.2.1.2.9 --- php-src/ext/interbase/ibase_query.c:1.23.2.1.2.8 Tue Feb 27 03:04:40 2007 +++ php-src/ext/interbase/ibase_query.c Thu Mar 15 22:33:04 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ibase_query.c,v 1.23.2.1.2.8 2007/02/27 03:04:40 iliaa Exp $ */ +/* $Id: ibase_query.c,v 1.23.2.1.2.9 2007/03/15 22:33:04 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -668,13 +668,13 @@ var->sqldata = (void*)&buf[i].val; switch (var->sqltype & ~1) { - struct tm *t, tmbuf; + struct tm t; 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"); @@ -688,7 +688,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; } @@ -699,13 +699,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;