cvs: php4 /ext/odbc php_odbc.c
| From: | Dan Kalowsky | Date: | Tue, 13 Aug 2002 21:39:37 +0000 |
| Subject: | cvs: php4 /ext/odbc php_odbc.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13329@lists.php.net to get a copy of this message | ||
kalowsky Tue Aug 13 17:39:37 2002 EDT
Modified files:
/php4/ext/odbc php_odbc.c
Log:
fixing my misunderstanding of the php_error_docref
Index: php4/ext/odbc/php_odbc.c
diff -u php4/ext/odbc/php_odbc.c:1.137 php4/ext/odbc/php_odbc.c:1.138
--- php4/ext/odbc/php_odbc.c:1.137 Tue Aug 13 09:26:31 2002
+++ php4/ext/odbc/php_odbc.c Tue Aug 13 17:39:36 2002
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc.c,v 1.137 2002/08/13 13:26:31 kalowsky Exp $ */
+/* $Id: php_odbc.c,v 1.138 2002/08/13 21:39:36 kalowsky Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -833,7 +833,7 @@
rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
if (rc == SQL_INVALID_HANDLE) {
efree(result);
- php_error_docref("function.odbc-prepare" TSRMLS_CC, E_WARNING, "SQLAllocStmt error
'Invalid Handle'");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid
Handle'");
RETURN_FALSE;
}
@@ -929,7 +929,7 @@
if (zend_get_parameters_ex(2, &pv_res, &pv_param_arr) == FAILURE)
WRONG_PARAM_COUNT;
if (Z_TYPE_PP(pv_param_arr) != IS_ARRAY) {
- php_error_docref("function.odbc-execute" TSRMLS_CC, E_WARNING, "No array
passed");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "No array passed");
RETURN_FALSE;
}
break;
@@ -1182,7 +1182,7 @@
if (!(fetch_type == SQL_FETCH_FIRST ||
fetch_type == SQL_FETCH_NEXT)) {
- php_error_docref("function.odbc-data-source" TSRMLS_CC, E_WARNING, "Invalid fetch
type (%d)", fetch_type);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid fetch type (%d)", fetch_type);
RETURN_FALSE;
}
@@ -1255,7 +1255,7 @@
rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
if (rc == SQL_INVALID_HANDLE) {
- php_error_docref("function.odbc-exec" TSRMLS_CC, E_WARNING, "SQLAllocStmt error
'Invalid Handle'");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid
Handle'");
efree(result);
RETURN_FALSE;
}
@@ -2172,7 +2172,7 @@
cur_opt == SQL_CUR_USE_ODBC ||
cur_opt == SQL_CUR_USE_DRIVER ||
cur_opt == SQL_CUR_DEFAULT) ) {
- php_error_docref("function.odbc-connect" TSRMLS_CC, E_WARNING, "Invalid Cursor
type (%d)", cur_opt);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Cursor type (%d)", cur_opt);
RETURN_FALSE;
}
break;
@@ -2225,7 +2225,7 @@
RETURN_FALSE;
}
if (ODBCG(max_persistent) != -1 && ODBCG(num_persistent) >= ODBCG(max_persistent)) {
- php_error_docref1("function.odbc-pconnect" TSRMLS_CC, E_WARNING,"Too many open
persistent links (%d)", ODBCG(num_persistent));
+ php_error_docref1(NULL TSRMLS_CC, E_WARNING,"Too many open persistent links (%d)",
ODBCG(num_persistent));
efree(hashed_details);
RETURN_FALSE;
}
@@ -2304,7 +2304,7 @@
}
}
if (ODBCG(max_links) != -1 && ODBCG(num_links) >= ODBCG(max_links)) {
- php_error_docref("function.odbc-connect" TSRMLS_CC, E_WARNING,"Too many open
connections (%d)",ODBCG(num_links));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,"Too many open connections
(%d)",ODBCG(num_links));
efree(hashed_details);
RETURN_FALSE;
}
@@ -2743,7 +2743,7 @@
}
break;
default:
- php_error_docref("function.odbc-setoption" TSRMLS_CC, E_WARNING, "Unknown option
type");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown option type");
RETURN_FALSE;
break;
}
@@ -2797,7 +2797,7 @@
rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
if (rc == SQL_INVALID_HANDLE) {
efree(result);
- php_error_docref("function.odbc-tables" TSRMLS_CC, E_WARNING, "SQLAllocStmt error
'Invalid Handle'");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid
Handle'");
RETURN_FALSE;
}
@@ -2885,7 +2885,7 @@
rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
if (rc == SQL_INVALID_HANDLE) {
efree(result);
- php_error_docref("function.odbc-columns" TSRMLS_CC, E_WARNING, "SQLAllocStmt error
'Invalid Handle'");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid
Handle'");
RETURN_FALSE;
}
@@ -2964,7 +2964,7 @@
rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
if (rc == SQL_INVALID_HANDLE) {
efree(result);
- php_error_docref("function.odbc-columnprivileges" TSRMLS_CC, E_WARNING,
"SQLAllocStmt error 'Invalid Handle'");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid
Handle'");
RETURN_FALSE;
}
@@ -3062,7 +3062,7 @@
rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
if (rc == SQL_INVALID_HANDLE) {
efree(result);
- php_error_docref("function.odbc-foreignkeys" TSRMLS_CC, E_WARNING, "SQLAllocStmt
error 'Invalid Handle'");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid
Handle'");
RETURN_FALSE;
}
@@ -3141,7 +3141,7 @@
rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
if (rc == SQL_INVALID_HANDLE) {
efree(result);
- php_error_docref("function.odbc-gettypeinfo" TSRMLS_CC, E_WARNING, "SQLAllocStmt
error 'Invalid Handle'");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid
Handle'");
RETURN_FALSE;
}
@@ -3213,7 +3213,7 @@
rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
if (rc == SQL_INVALID_HANDLE) {
efree(result);
- php_error_docref("function.odbc-primarykeys" TSRMLS_CC, E_WARNING, "SQLAllocStmt
error 'Invalid Handle'");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid
Handle'");
RETURN_FALSE;
}
@@ -3295,7 +3295,7 @@
rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
if (rc == SQL_INVALID_HANDLE) {
efree(result);
- php_error_docref("function.odbc-procedurecolumns" TSRMLS_CC, E_WARNING,
"SQLAllocStmt error 'Invalid Handle'");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid
Handle'");
RETURN_FALSE;
}
@@ -3377,7 +3377,7 @@
rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
if (rc == SQL_INVALID_HANDLE) {
efree(result);
- php_error_docref("function.odbc-procedures" TSRMLS_CC, E_WARNING, "SQLAllocStmt
error 'Invalid Handle'");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid
Handle'");
RETURN_FALSE;
}
@@ -3463,7 +3463,7 @@
rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
if (rc == SQL_INVALID_HANDLE) {
efree(result);
- php_error_docref("function.odbc-specialcolumns" TSRMLS_CC, E_WARNING,
"SQLAllocStmt error 'Invalid Handle'");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid
Handle'");
RETURN_FALSE;
}
@@ -3548,7 +3548,7 @@
rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
if (rc == SQL_INVALID_HANDLE) {
efree(result);
- php_error_docref("function.odbc-statistics" TSRMLS_CC, E_WARNING, "SQLAllocStmt
error 'Invalid Handle'");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid
Handle'");
RETURN_FALSE;
}
@@ -3626,7 +3626,7 @@
rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
if (rc == SQL_INVALID_HANDLE) {
efree(result);
- php_error_docref("function.odbc-tableprivileges" TSRMLS_CC, E_WARNING,
"SQLAllocStmt error 'Invalid Handle'");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid
Handle'");
RETURN_FALSE;
}