Show function name in error message.

This commit is contained in:
Yasuo Ohgaki 2002-03-21 00:06:45 +00:00
parent d5e64b2287
commit 4094513915

View File

@ -1130,7 +1130,8 @@ PHP_FUNCTION(pg_fetch_result)
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 @@ PHP_FUNCTION(pg_fetch_result)
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 @@ static void php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
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 @@ static void php_pgsql_data_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type)
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 @@ static void php_pgsql_data_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type)
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;
}