cvs: php4 /ext/pgsql pgsql.c

yohgaki Wed Mar 20 19:06:45 2002 EDT Modified files: /php4/ext/pgsql pgsql.c Log: Show function name in error message. Index: php4/ext/pgsql/pgsql.c diff -u php4/ext/pgsql/pgsql.c:1.159 php4/ext/pgsql/pgsql.c:1.160 --- php4/ext/pgsql/pgsql.c:1.159 Wed Mar 20 09:21:28 2002 +++ php4/ext/pgsql/pgsql.c Wed Mar 20 19:06:45 2002 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.159 2002/03/20 14:21:28 wez Exp $ */ +/* $Id: pgsql.c,v 1.160 2002/03/21 00:06:45 yohgaki Exp $ */ #include <stdlib.h> @@ -1130,7 +1130,8 @@ convert_to_long_ex(row); pgsql_row = Z_LVAL_PP(row); if (pgsql_row < 0 || pgsql_row >= PQntuples(pgsql_result)) { - php_error(E_WARNING,"Unable to jump to row %d on PostgreSQL result index %d", Z_LVAL_PP(row), Z_LVAL_PP(result)); + php_error(E_WARNING,"%s() unable to jump to row %d on PostgreSQL result index %d", + get_active_function_name(TSRMLS_C), Z_LVAL_PP(row), Z_LVAL_PP(result)); RETURN_FALSE; } } @@ -1144,7 +1145,8 @@ break; } if (field_offset<0 || field_offset>=PQnfields(pgsql_result)) { - php_error(E_WARNING,"Bad column offset specified"); + php_error(E_WARNING,"%s() bad column offset specified", + get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -1214,7 +1216,8 @@ pgsql_row = Z_LVAL_PP(row); pg_result->row = pgsql_row; if (pgsql_row < 0 || pgsql_row >= PQntuples(pgsql_result)) { - php_error(E_WARNING, "Unable to jump to row %d on PostgreSQL result index %d", Z_LVAL_PP(row), Z_LVAL_PP(result)); + php_error(E_WARNING, "%s() unable to jump to row %d on PostgreSQL result index %d", + get_active_function_name(TSRMLS_C), Z_LVAL_PP(row), Z_LVAL_PP(result)); RETURN_FALSE; } } else { @@ -1324,7 +1327,8 @@ convert_to_long_ex(row); pgsql_row = Z_LVAL_PP(row); if (pgsql_row < 0 || pgsql_row >= PQntuples(pgsql_result)) { - php_error(E_WARNING,"Unable to jump to row %d on PostgreSQL result index %d", Z_LVAL_PP(row), Z_LVAL_PP(result)); + php_error(E_WARNING,"%s() unable to jump to row %d on PostgreSQL result index %d", + get_active_function_name(TSRMLS_C), Z_LVAL_PP(row), Z_LVAL_PP(result)); RETURN_FALSE; } } @@ -1340,7 +1344,7 @@ break; } if (field_offset < 0 || field_offset >= PQnfields(pgsql_result)) { - php_error(E_WARNING, "Bad column offset specified"); + php_error(E_WARNING, "%s() bad column offset specified"); RETURN_FALSE; }