cvs: php4 /ext/pgsql pgsql.c

yohgaki Tue Dec 18 18:52:55 2001 EDT Modified files: /php4/ext/pgsql pgsql.c Log: More proper error message. Remove old lines that aren't needed. Index: php4/ext/pgsql/pgsql.c diff -u php4/ext/pgsql/pgsql.c:1.138 php4/ext/pgsql/pgsql.c:1.139 --- php4/ext/pgsql/pgsql.c:1.138 Mon Dec 17 07:14:46 2001 +++ php4/ext/pgsql/pgsql.c Tue Dec 18 18:52:55 2001 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.138 2001/12/17 12:14:46 hholzgra Exp $ */ +/* $Id: pgsql.c,v 1.139 2001/12/18 23:52:55 yohgaki Exp $ */ #include <stdlib.h> @@ -848,7 +848,8 @@ convert_to_string_ex(query); if (PQisBusy(pgsql)) { - php_error(E_NOTICE,"PostgreSQL: Cannot execute query while executing async query."); + php_error(E_NOTICE,"%s() cannot execute query while executing async query.", + get_active_function_name(TSRMLS_C)); RETURN_FALSE; } while ((pgsql_result = PQgetResult(pgsql))) { @@ -883,10 +884,6 @@ pg_result->result = pgsql_result; pg_result->row = -1; ZEND_REGISTER_RESOURCE(return_value, pg_result, le_result); - /* - Z_LVAL_P(return_value) = zend_list_insert(pg_result,le_result); - Z_TYPE_P(return_value) = IS_LONG; - */ } else { RETURN_FALSE; }