fixing my misunderstanding of the php_error_docref

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 8c39cf3af9fdfffad03a322bda885fea97deceab..be52ab4b64fa76504ad4da60b3e6a142c9ac87c0 100644 (file)
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -833,7 +833,7 @@ PHP_FUNCTION(odbc_prepare)
        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 @@ PHP_FUNCTION(odbc_execute)
                        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 @@ PHP_FUNCTION(odbc_data_source)
 
        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 @@ PHP_FUNCTION(odbc_exec)
 
        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 @@ void odbc_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
                                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 @@ try_and_get_another_connection:
                                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 @@ try_and_get_another_connection:
                        }
                }
                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 @@ PHP_FUNCTION(odbc_setoption)
                        }
                        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 @@ PHP_FUNCTION(odbc_tables)
        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 @@ PHP_FUNCTION(odbc_columns)
        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 @@ PHP_FUNCTION(odbc_columnprivileges)
        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 @@ PHP_FUNCTION(odbc_foreignkeys)
        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 @@ PHP_FUNCTION(odbc_gettypeinfo)
        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 @@ PHP_FUNCTION(odbc_primarykeys)
        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 @@ PHP_FUNCTION(odbc_procedurecolumns)
        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 @@ PHP_FUNCTION(odbc_procedures)
        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 @@ PHP_FUNCTION(odbc_specialcolumns)
        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 @@ PHP_FUNCTION(odbc_statistics)
        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 @@ PHP_FUNCTION(odbc_tableprivileges)
        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;
        }