cvs: php4 /ext/msql php_msql.c

derick Wed Jun 26 04:39:38 2002 EDT Modified files: /php4/ext/msql php_msql.c Log: Unify error messages Index: php4/ext/msql/php_msql.c diff -u php4/ext/msql/php_msql.c:1.48 php4/ext/msql/php_msql.c:1.49 --- php4/ext/msql/php_msql.c:1.48 Tue Mar 12 15:17:48 2002 +++ php4/ext/msql/php_msql.c Wed Jun 26 04:39:36 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_msql.c,v 1.48 2002/03/12 20:17:48 andi Exp $ */ +/* $Id: php_msql.c,v 1.49 2002/06/26 08:39:36 derick Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -267,12 +267,12 @@ list_entry *le; if (msql_globals.max_links!=-1 && msql_globals.num_links>=msql_globals.max_links) { - php_error(E_WARNING,"mSQL: Too many open links (%d)",msql_globals.num_links); + php_error(E_WARNING, "%s(): Too many open links (%d)", get_active_function_name(TSRMLS_C), msql_globals.num_links); efree(hashed_details); RETURN_FALSE; } if (msql_globals.max_persistent!=-1 && msql_globals.num_persistent>=msql_globals.max_persistent) { - php_error(E_WARNING,"mSQL: Too many open persistent links (%d)",msql_globals.num_persistent); + php_error(E_WARNING, "%s(): Too many open persistent links (%d)", get_active_function_name(TSRMLS_C), msql_globals.num_persistent); efree(hashed_details); RETURN_FALSE; } @@ -343,7 +343,7 @@ } } if (msql_globals.max_links!=-1 && msql_globals.num_links>=msql_globals.max_links) { - php_error(E_WARNING,"mSQL: Too many open links (%d)",msql_globals.num_links); + php_error(E_WARNING, "%s(): Too many open links (%d)", get_active_function_name(TSRMLS_C),msql_globals.num_links); efree(hashed_details); RETURN_FALSE; } @@ -655,7 +655,7 @@ ZEND_FETCH_RESOURCE2(msql, int, &msql_link, id, "mSQL-Link", msql_globals.le_link, msql_globals.le_plink); if ((msql_result=msqlListDBs(msql))==NULL) { - php_error(E_WARNING,"Unable to save mSQL query result"); + php_error(E_WARNING, "%s(): Unable to save mSQL query result", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } ZEND_REGISTER_RESOURCE(return_value, php_msql_query_wrapper(msql_result, 0), msql_globals.le_query); @@ -696,7 +696,7 @@ RETURN_FALSE; } if ((msql_result=msqlListTables(msql))==NULL) { - php_error(E_WARNING,"Unable to save mSQL query result"); + php_error(E_WARNING, "%s(): Unable to save mSQL query result", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } ZEND_REGISTER_RESOURCE(return_value, php_msql_query_wrapper(msql_result, 0), msql_globals.le_query); @@ -738,7 +738,7 @@ } convert_to_string(table); if ((msql_result=msqlListFields(msql,Z_STRVAL_P(table)))==NULL) { - php_error(E_WARNING,"Unable to save mSQL query result"); + php_error(E_WARNING, "%s(): Unable to save mSQL query result", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } ZEND_REGISTER_RESOURCE(return_value, php_msql_query_wrapper(msql_result, 0), msql_globals.le_query); @@ -786,7 +786,7 @@ convert_to_long(row); if (Z_LVAL_P(row)<0 || Z_LVAL_P(row)>=msqlNumRows(msql_result)) { - php_error(E_WARNING,"Unable to jump to row %d on mSQL query index %d",Z_LVAL_P(row),Z_LVAL_P(result)); + php_error(E_WARNING, "%s(): Unable to jump to row %d on mSQL query index %d", get_active_function_name(TSRMLS_C),Z_LVAL_P(row),Z_LVAL_P(result)); RETURN_FALSE; } msqlDataSeek(msql_result,Z_LVAL_P(row)); @@ -818,7 +818,7 @@ i++; } if (!tmp_field) { /* no match found */ - php_error(E_WARNING,"%s%s%s not found in mSQL query index %d", + php_error(E_WARNING, "%s(): %s%s%s not found in mSQL query index %d", get_active_function_name(TSRMLS_C), (table_name?table_name:""), (table_name?".":""), field_name, Z_LVAL_P(result)); efree(field_name); if (table_name) { @@ -836,7 +836,7 @@ convert_to_long(field); field_offset = Z_LVAL_P(field); if (field_offset<0 || field_offset>=msqlNumFields(msql_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; } break; @@ -1012,7 +1012,7 @@ if (!msql_result || Z_LVAL_P(offset)<0 || Z_LVAL_P(offset)>=msqlNumRows(msql_result)) { - php_error(E_WARNING,"Offset %d is invalid for mSQL query index %d",Z_LVAL_P(offset),Z_LVAL_P(result)); + php_error(E_WARNING, "%s(): %d is invalid for mSQL query index %d", get_active_function_name(TSRMLS_C),Z_LVAL_P(offset),Z_LVAL_P(result)); RETURN_FALSE; } msqlDataSeek(msql_result,Z_LVAL_P(offset)); @@ -1089,7 +1089,7 @@ if (field) { if (Z_LVAL_P(field)<0 || Z_LVAL_P(field)>=msqlNumRows(msql_result)) { - php_error(E_NOTICE,"mSQL: Bad field offset specified"); + php_error(E_NOTICE, "%s(): Bad field offset specified", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } msqlFieldSeek(msql_result,Z_LVAL_P(field)); @@ -1132,7 +1132,7 @@ RETURN_FALSE; } if (Z_LVAL_P(offset)<0 || Z_LVAL_P(offset)>=msqlNumFields(msql_result)) { - php_error(E_WARNING,"Field %d is invalid for mSQL query index %d", + php_error(E_WARNING,"%s(): Field %d is invalid for mSQL query index %d", get_active_function_name(TSRMLS_C), Z_LVAL_P(offset),Z_LVAL_P(result)); RETURN_FALSE; } @@ -1166,7 +1166,7 @@ } convert_to_long(field); if (Z_LVAL_P(field)<0 || Z_LVAL_P(field)>=msqlNumFields(msql_result)) { - php_error(E_WARNING,"Field %d is invalid for mSQL query index %d",Z_LVAL_P(field),Z_LVAL_P(result)); + php_error(E_WARNING,"%s(): Field %d is invalid for mSQL query index %d", get_active_function_name(TSRMLS_C),Z_LVAL_P(field),Z_LVAL_P(result)); RETURN_FALSE; } msqlFieldSeek(msql_result,Z_LVAL_P(field));