cvs: php4 /ext/dbx dbx_pgsql.c /ext/pgsql pgsql.c

hirokawa Sat Apr 14 03:32:14 2001 EDT Modified files: /php4/ext/dbx dbx_pgsql.c /php4/ext/pgsql pgsql.c Log: deleted warning output in dbx/pgsql. Index: php4/ext/dbx/dbx_pgsql.c diff -u php4/ext/dbx/dbx_pgsql.c:1.5 php4/ext/dbx/dbx_pgsql.c:1.6 --- php4/ext/dbx/dbx_pgsql.c:1.5 Wed Apr 11 01:14:57 2001 +++ php4/ext/dbx/dbx_pgsql.c Sat Apr 14 03:32:14 2001 @@ -236,6 +236,7 @@ /* returns array[0..columncount-1] as strings on success or 0 as long on failure */ int number_of_arguments=2; + int save_error_reporting=0; zval ** arguments[2]; zval * zval_row=NULL; zval * returned_zval=NULL; @@ -250,7 +251,14 @@ return 0; } */ + if (EG(error_reporting) & E_WARNING){ + save_error_reporting = EG(error_reporting); + EG(error_reporting) &= ~E_WARNING; + } dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "pg_fetch_array", &returned_zval, number_of_arguments, arguments); + if (save_error_reporting) { + EG(error_reporting) = save_error_reporting; + } if (!returned_zval || returned_zval->type!=IS_ARRAY) { if (returned_zval) zval_ptr_dtor(&returned_zval); FREE_ZVAL(zval_row); Index: php4/ext/pgsql/pgsql.c diff -u php4/ext/pgsql/pgsql.c:1.97 php4/ext/pgsql/pgsql.c:1.98 --- php4/ext/pgsql/pgsql.c:1.97 Thu Apr 5 05:29:24 2001 +++ php4/ext/pgsql/pgsql.c Sat Apr 14 03:32:14 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.97 2001/04/05 12:29:24 romolo Exp $ */ +/* $Id: pgsql.c,v 1.98 2001/04/14 10:32:14 hirokawa Exp $ */ #include <stdlib.h> @@ -532,8 +532,6 @@ } ZEND_FETCH_RESOURCE2(pgsql, PGconn *, pgsql_link, id, "PostgreSQL link", le_link, le_plink); - - printf("\npg_close %d\n",id); if (id==-1) { /* explicit resource number */ zend_list_delete(Z_RESVAL_PP(pgsql_link));