abies Mon Aug 11 22:16:40 2003 EDT
Modified files:
/php-src/ext/interbase interbase.c
Log:
Fix for failed tests except 005
Index: php-src/ext/interbase/interbase.c
diff -u php-src/ext/interbase/interbase.c:1.129 php-src/ext/interbase/interbase.c:1.130
--- php-src/ext/interbase/interbase.c:1.129 Mon Aug 11 22:11:41 2003
+++ php-src/ext/interbase/interbase.c Mon Aug 11 22:16:40 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interbase.c,v 1.129 2003/08/12 02:11:41 sniper Exp $ */
+/* $Id: interbase.c,v 1.130 2003/08/12 02:16:40 abies Exp $ */
/* TODO: Arrays, roles?
@@ -687,7 +687,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "Interbase Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.129 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.130 $");
#ifdef COMPILE_DL_INTERBASE
php_info_print_table_row(2, "Dynamic Module", "Yes");
#endif
@@ -1906,12 +1906,12 @@
static void _php_ibase_do_fetch(ibase_result *ib_result TSRMLS_DC)
{
if (ib_result->has_more_rows) {
- if (isc_dsql_fetch(IB_STATUS, &ib_result->stmt, 1,
ib_result->out_sqlda) == 100L) {
+ if (isc_dsql_fetch(IB_STATUS, &ib_result->stmt, 1,
ib_result->out_sqlda)) {
+
ib_result->has_more_rows = 0;
- }
-
- if (IB_STATUS[0] && IB_STATUS[1]) { /* error in fetch */
- _php_ibase_error(TSRMLS_C);
+ if (IB_STATUS[0] && IB_STATUS[1]) { /* error in fetch */
+ _php_ibase_error(TSRMLS_C);
+ }
}
}
}
@@ -3528,7 +3528,7 @@
unsigned short b;
ibase_blob_handle ib_blob;
ibase_db_link *ib_link;
- ibase_trans *trans;
+ ibase_trans *trans = NULL;
char bl_data[IBASE_BLOB_SEG]; /* FIXME? blob_seg_size parameter? */
php_stream *stream;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
