fmk Tue Dec 3 14:19:46 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/mssql php_mssql.c
Log:
MFH
# Changed php_error() to php_error_docref()
Index: php4/ext/mssql/php_mssql.c
diff -u php4/ext/mssql/php_mssql.c:1.86.2.3 php4/ext/mssql/php_mssql.c:1.86.2.4
--- php4/ext/mssql/php_mssql.c:1.86.2.3 Tue Dec 3 13:59:38 2002
+++ php4/ext/mssql/php_mssql.c Tue Dec 3 14:19:45 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mssql.c,v 1.86.2.3 2002/12/03 18:59:38 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.86.2.4 2002/12/03 19:19:45 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -146,7 +146,7 @@
TSRMLS_FETCH();
if (severity >= MS_SQL_G(min_error_severity)) {
- php_error(E_WARNING,"%s(): %s (severity %d)",
get_active_function_name(TSRMLS_C), dberrstr, severity);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s (severity %d)",
+dberrstr, severity);
}
return INT_CANCEL;
}
@@ -157,7 +157,7 @@
TSRMLS_FETCH();
if (severity >= MS_SQL_G(min_message_severity)) {
- php_error(E_WARNING,"%s(): message: %s (severity %d)",
get_active_function_name(TSRMLS_C), msgtext, severity);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "message: %s (severity
+%d)", msgtext, severity);
}
if (MS_SQL_G(server_message)) {
STR_FREE(MS_SQL_G(server_message));
@@ -432,13 +432,13 @@
}
if (hashed_details == NULL) {
- php_error(E_WARNING, "%s(): Out of memory",
get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Out of memory");
RETURN_FALSE;
}
/* set a DBLOGIN record */
if ((mssql.login = dblogin()) == NULL) {
- php_error(E_WARNING,"%s(): Unable to allocate login record",
get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to allocate login
+record");
RETURN_FALSE;
}
@@ -473,20 +473,20 @@
list_entry new_le;
if (MS_SQL_G(max_links) != -1 && MS_SQL_G(num_links) >=
MS_SQL_G(max_links)) {
- php_error(E_WARNING,"%s(): Too many open links (%d)",
get_active_function_name(TSRMLS_C), MS_SQL_G(num_links));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many
+open links (%d)", MS_SQL_G(num_links));
efree(hashed_details);
dbfreelogin(mssql.login);
RETURN_FALSE;
}
if (MS_SQL_G(max_persistent) != -1 && MS_SQL_G(num_persistent)
>= MS_SQL_G(max_persistent)) {
- php_error(E_WARNING,"%s(): Too many open persistent
links (%d)", get_active_function_name(TSRMLS_C), MS_SQL_G(num_persistent));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many
+open persistent links (%d)", MS_SQL_G(num_persistent));
efree(hashed_details);
dbfreelogin(mssql.login);
RETURN_FALSE;
}
/* create the link */
if ((mssql.link = dbopen(mssql.login, host)) == FAIL) {
- php_error(E_WARNING,"%s(): Unable to connect to
server: %s", get_active_function_name(TSRMLS_C), host);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to
+connect to server: %s", host);
efree(hashed_details);
dbfreelogin(mssql.login);
RETURN_FALSE;
@@ -532,7 +532,7 @@
#if BROKEN_MSSQL_PCONNECTS
log_error("PHP/MS SQL: Hashed persistent link is not
a MS SQL link!",php_rqst->server);
#endif
- php_error(E_WARNING, "%s(): Hashed persistent link is
not a MS SQL link!", get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Hashed
+persistent link is not a MS SQL link!");
RETURN_FALSE;
}
@@ -546,7 +546,7 @@
#if BROKEN_MSSQL_PCONNECTS
log_error("PHP/MS SQL: Unable to
reconnect!",php_rqst->server);
#endif
- php_error(E_WARNING, "%s(): Link to server
lost, unable to reconnect", get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
+"Link to server lost, unable to reconnect");
zend_hash_del(&EG(persistent_list),
hashed_details, hashed_details_length+1);
efree(hashed_details);
RETURN_FALSE;
@@ -594,13 +594,13 @@
}
}
if (MS_SQL_G(max_links) != -1 && MS_SQL_G(num_links) >=
MS_SQL_G(max_links)) {
- php_error(E_WARNING,"%s(): Too many open links (%d)",
get_active_function_name(TSRMLS_C), MS_SQL_G(num_links));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open
+links (%d)", MS_SQL_G(num_links));
efree(hashed_details);
RETURN_FALSE;
}
if ((mssql.link=dbopen(mssql.login, host))==NULL) {
- php_error(E_WARNING,"%s(): Unable to connect to server: %s",
get_active_function_name(TSRMLS_C), host);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to connect
+to server: %s", host);
efree(hashed_details);
RETURN_FALSE;
}
@@ -740,7 +740,7 @@
convert_to_string_ex(db);
if (dbuse(mssql_ptr->link, Z_STRVAL_PP(db))==FAIL) {
- php_error(E_WARNING, "%s(): Unable to select database: %s",
get_active_function_name(TSRMLS_C), Z_STRVAL_PP(db));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to select
+database: %s", Z_STRVAL_PP(db));
RETURN_FALSE;
} else {
RETURN_TRUE;
@@ -831,7 +831,7 @@
Z_STRLEN_P(result) = res_length;
Z_TYPE_P(result) = IS_STRING;
} else {
- php_error(E_WARNING, "%s(): column %d has unknown data
type (%d)", get_active_function_name(TSRMLS_C), offset, coltype(offset));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "column %d
+has unknown data type (%d)", offset, coltype(offset));
ZVAL_FALSE(result);
}
}
@@ -885,7 +885,7 @@
Z_STRLEN_P(result) = res_length;
Z_TYPE_P(result) = IS_STRING;
} else {
- php_error(E_WARNING, "%s(): column %d has unknown data type (%d)",
get_active_function_name(TSRMLS_C), offset, coltype(offset));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "column %d has unknown
+data type (%d)", offset, coltype(offset));
ZVAL_FALSE(result);
}
}
@@ -931,7 +931,7 @@
}
}
else {
- php_error(E_WARNING, "%s(): an output
parameter variable was not provided", get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
+"An output parameter variable was not provided");
}
}
}
@@ -943,7 +943,7 @@
Z_LVAL_P(bind->zval)=dbretstatus(mssql_ptr->link);
}
else {
- php_error(E_WARNING, "%s(): stored procedure has no
return value. Nothing was returned into RETVAL", get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "stored
+procedure has no return value. Nothing was returned into RETVAL");
}
}
}
@@ -1095,11 +1095,11 @@
convert_to_string_ex(query);
if (dbcmd(mssql_ptr->link, Z_STRVAL_PP(query))==FAIL) {
- php_error(E_WARNING, "%s(): Unable to set query",
get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set query");
RETURN_FALSE;
}
if (dbsqlexec(mssql_ptr->link)==FAIL || dbresults(mssql_ptr->link)==FAIL) {
- php_error(E_WARNING, "%s(): Query failed",
get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Query failed");
RETURN_FALSE;
}
@@ -1381,7 +1381,7 @@
convert_to_long_ex(offset);
if (Z_LVAL_PP(offset)<0 || Z_LVAL_PP(offset)>=result->num_rows) {
- php_error(E_WARNING, "%s(): Bad row offset",
get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad row offset");
RETURN_FALSE;
}
@@ -1477,7 +1477,7 @@
if (field_offset<0 || field_offset >= result->num_fields) {
if (ZEND_NUM_ARGS()==2) { /* field specified explicitly */
- php_error(E_WARNING, "%s(): Bad column offset",
get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad column
+offset");
}
RETURN_FALSE;
}
@@ -1530,7 +1530,7 @@
if (field_offset<0 || field_offset >= result->num_fields) {
if (ZEND_NUM_ARGS()==2) { /* field specified explicitly */
- php_error(E_WARNING, "%s(): Bad column offset",
get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad column
+offset");
}
RETURN_FALSE;
}
@@ -1577,7 +1577,7 @@
if (field_offset<0 || field_offset >= result->num_fields) {
if (ZEND_NUM_ARGS()==2) { /* field specified explicitly */
- php_error(E_WARNING, "%s(): Bad column offset",
get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad column
+offset");
}
RETURN_FALSE;
}
@@ -1625,7 +1625,7 @@
if (field_offset<0 || field_offset >= result->num_fields) {
if (ZEND_NUM_ARGS()==2) { /* field specified explicitly */
- php_error(E_WARNING, "%s(): Bad column offset",
get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad column
+offset");
}
RETURN_FALSE;
}
@@ -1655,7 +1655,7 @@
field_offset = Z_LVAL_PP(offset);
if (field_offset<0 || field_offset >= result->num_fields) {
- php_error(E_WARNING, "%s(): Bad column offset",
get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad column offset");
RETURN_FALSE;
}
@@ -1681,7 +1681,7 @@
convert_to_long_ex(row);
if (Z_LVAL_PP(row) < 0 || Z_LVAL_PP(row) >= result->num_rows) {
- php_error(E_WARNING, "%s(): Bad row offset (%d)",
get_active_function_name(TSRMLS_C), Z_LVAL_PP(row));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad row offset (%d)",
+Z_LVAL_PP(row));
RETURN_FALSE;
}
@@ -1696,7 +1696,7 @@
}
}
if (i>=result->num_fields) { /* no match found */
- php_error(E_WARNING,"%s(): %s field not found in
result", get_active_function_name(TSRMLS_C), Z_STRVAL_PP(field));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s field
+not found in result", Z_STRVAL_PP(field));
RETURN_FALSE;
}
break;
@@ -1705,7 +1705,7 @@
convert_to_long_ex(field);
field_offset = Z_LVAL_PP(field);
if (field_offset<0 || field_offset>=result->num_fields) {
- php_error(E_WARNING, "%s(): Bad column offset
specified", get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad
+column offset specified");
RETURN_FALSE;
}
break;
@@ -1822,7 +1822,7 @@
convert_to_string_ex(sp_name);
if (dbrpcinit(mssql_ptr->link, Z_STRVAL_PP(sp_name),0)==FAIL) {
- php_error(E_WARNING, "%s(): unable to init stored procedure",
get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to init stored
+procedure");
RETURN_FALSE;
}
@@ -1834,7 +1834,7 @@
statement->executed=FALSE;
}
else {
- php_error(E_WARNING, "%s(): unable to allocate statement",
get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to allocate
+statement");
RETURN_FALSE;
}
@@ -1971,7 +1971,7 @@
break;
default:
- php_error(E_WARNING, "%s(): unsupported type",
get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
+"unsupported type");
RETURN_FALSE;
break;
}
@@ -1997,7 +1997,7 @@
/* no call to dbrpcparam if RETVAL */
if ( strcmp("RETVAL",Z_STRVAL_PP(param_name))!=0 ) {
if (dbrpcparam(mssql_ptr->link, Z_STRVAL_PP(param_name), (BYTE)status,
type, maxlen, datalen, (LPCBYTE)value)==FAIL) {
- php_error(E_WARNING, "%s(): Unable to set parameter",
get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set
+parameter");
RETURN_FALSE;
}
}
@@ -2030,14 +2030,14 @@
mssql_ptr=statement->link;
if (dbrpcexec(mssql_ptr->link)==FAIL || dbsqlok(mssql_ptr->link)==FAIL) {
- php_error(E_WARNING, "%s(): stored procedure execution failed.",
get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "stored procedure
+execution failed");
RETURN_FALSE;
}
retval_results=dbresults(mssql_ptr->link);
if (retval_results==FAIL) {
- php_error(E_WARNING, "%s(): could not retrieve results",
get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "could not retrieve
+results");
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
