summaryrefslogtreecommitdiff
path: root/ext/odbc
diff options
context:
space:
mode:
Diffstat (limited to 'ext/odbc')
-rw-r--r--ext/odbc/php_odbc.c32
-rw-r--r--ext/odbc/php_velocis.h2
-rw-r--r--ext/odbc/velocis.c28
3 files changed, 31 insertions, 31 deletions
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index fed1ba12ce..60556271a0 100644
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -477,7 +477,7 @@ void ODBC_SQL_ERROR(HENV henv, HDBC conn, HSTMT stmt, char *func)
} while ( SQL_SUCCEEDED( ret ));
}
-void php3_odbc_fetch_attribs(INTERNAL_FUNCTION_PARAMETERS, int mode)
+void php_odgbc_fetch_attribs(INTERNAL_FUNCTION_PARAMETERS, int mode)
{
odbc_result *result;
pval **pv_res, **pv_flag;
@@ -608,7 +608,7 @@ PHP_FUNCTION(odbc_close_all)
Handle binary column data */
PHP_FUNCTION(odbc_binmode)
{
- php3_odbc_fetch_attribs(INTERNAL_FUNCTION_PARAM_PASSTHRU,0);
+ php_odgbc_fetch_attribs(INTERNAL_FUNCTION_PARAM_PASSTHRU,0);
}
/* }}} */
@@ -616,7 +616,7 @@ PHP_FUNCTION(odbc_binmode)
Handle LONG columns */
PHP_FUNCTION(odbc_longreadlen)
{
- php3_odbc_fetch_attribs(INTERNAL_FUNCTION_PARAM_PASSTHRU,1);
+ php_odgbc_fetch_attribs(INTERNAL_FUNCTION_PARAM_PASSTHRU,1);
}
/* }}} */
@@ -650,7 +650,7 @@ PHP_FUNCTION(odbc_prepare)
rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
if (rc == SQL_INVALID_HANDLE) {
efree(result);
- php_error(E_WARNING, "SQLAllocStmt error 'Invalid Handle' in php3_odbc_prepare");
+ php_error(E_WARNING, "SQLAllocStmt error 'Invalid Handle' in odbc_prepare");
RETURN_FALSE;
}
@@ -889,7 +889,7 @@ PHP_FUNCTION(odbc_cursor)
result->stmt, state, &error, errormsg,
sizeof(errormsg)-1, &errormsgsize);
if (!strncmp(state,"S1015",5)) {
- sprintf(cursorname,"php3_curs_%d", (int)result->stmt);
+ sprintf(cursorname,"php_curs_%d", (int)result->stmt);
if (SQLSetCursorName(result->stmt,cursorname,SQL_NTS) != SQL_SUCCESS) {
ODBC_SQL_ERROR(result->conn_ptr->henv, result->conn_ptr->hdbc,
result->stmt, "SQLSetCursorName");
@@ -2202,7 +2202,7 @@ PHP_FUNCTION(odbc_tables)
rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
if (rc == SQL_INVALID_HANDLE) {
efree(result);
- php_error(E_WARNING, "SQLAllocStmt error 'Invalid Handle' in php3_odbc_tables");
+ php_error(E_WARNING, "SQLAllocStmt error 'Invalid Handle' in odbc_tables");
RETURN_FALSE;
}
@@ -2284,7 +2284,7 @@ PHP_FUNCTION(odbc_columns)
rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
if (rc == SQL_INVALID_HANDLE) {
efree(result);
- php_error(E_WARNING, "SQLAllocStmt error 'Invalid Handle' in php3_odbc_columns");
+ php_error(E_WARNING, "SQLAllocStmt error 'Invalid Handle' in odbc_columns");
RETURN_FALSE;
}
@@ -2363,7 +2363,7 @@ PHP_FUNCTION(odbc_columnprivileges)
rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
if (rc == SQL_INVALID_HANDLE) {
efree(result);
- php_error(E_WARNING, "SQLAllocStmt error 'Invalid Handle' in php3_odbc_columnprivileges");
+ php_error(E_WARNING, "SQLAllocStmt error 'Invalid Handle' in odbc_columnprivileges");
RETURN_FALSE;
}
@@ -2461,7 +2461,7 @@ PHP_FUNCTION(odbc_foreignkeys)
rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
if (rc == SQL_INVALID_HANDLE) {
efree(result);
- php_error(E_WARNING, "SQLAllocStmt error 'Invalid Handle' in php3_odbc_foreignkeys");
+ php_error(E_WARNING, "SQLAllocStmt error 'Invalid Handle' in odbc_foreignkeys");
RETURN_FALSE;
}
@@ -2540,7 +2540,7 @@ PHP_FUNCTION(odbc_gettypeinfo)
rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
if (rc == SQL_INVALID_HANDLE) {
efree(result);
- php_error(E_WARNING, "SQLAllocStmt error 'Invalid Handle' in php3_odbc_gettypeinfo");
+ php_error(E_WARNING, "SQLAllocStmt error 'Invalid Handle' in odbc_gettypeinfo");
RETURN_FALSE;
}
@@ -2612,7 +2612,7 @@ PHP_FUNCTION(odbc_primarykeys)
rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
if (rc == SQL_INVALID_HANDLE) {
efree(result);
- php_error(E_WARNING, "SQLAllocStmt error 'Invalid Handle' in php3_odbc_primarykeys");
+ php_error(E_WARNING, "SQLAllocStmt error 'Invalid Handle' in odbc_primarykeys");
RETURN_FALSE;
}
@@ -2694,7 +2694,7 @@ PHP_FUNCTION(odbc_procedurecolumns)
rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
if (rc == SQL_INVALID_HANDLE) {
efree(result);
- php_error(E_WARNING, "SQLAllocStmt error 'Invalid Handle' in php3_odbc_procedurecolumns");
+ php_error(E_WARNING, "SQLAllocStmt error 'Invalid Handle' in odbc_procedurecolumns");
RETURN_FALSE;
}
@@ -2776,7 +2776,7 @@ PHP_FUNCTION(odbc_procedures)
rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
if (rc == SQL_INVALID_HANDLE) {
efree(result);
- php_error(E_WARNING, "SQLAllocStmt error 'Invalid Handle' in php3_odbc_procedures");
+ php_error(E_WARNING, "SQLAllocStmt error 'Invalid Handle' in odbc_procedures");
RETURN_FALSE;
}
@@ -2862,7 +2862,7 @@ PHP_FUNCTION(odbc_specialcolumns)
rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
if (rc == SQL_INVALID_HANDLE) {
efree(result);
- php_error(E_WARNING, "SQLAllocStmt error 'Invalid Handle' in php3_odbc_specialcolumns");
+ php_error(E_WARNING, "SQLAllocStmt error 'Invalid Handle' in odbc_specialcolumns");
RETURN_FALSE;
}
@@ -2947,7 +2947,7 @@ PHP_FUNCTION(odbc_statistics)
rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
if (rc == SQL_INVALID_HANDLE) {
efree(result);
- php_error(E_WARNING, "SQLAllocStmt error 'Invalid Handle' in php3_odbc_statistics");
+ php_error(E_WARNING, "SQLAllocStmt error 'Invalid Handle' in odbc_statistics");
RETURN_FALSE;
}
@@ -3025,7 +3025,7 @@ PHP_FUNCTION(odbc_tableprivileges)
rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
if (rc == SQL_INVALID_HANDLE) {
efree(result);
- php_error(E_WARNING, "SQLAllocStmt error 'Invalid Handle' in php3_odbc_tableprivileges");
+ php_error(E_WARNING, "SQLAllocStmt error 'Invalid Handle' in odbc_tableprivileges");
RETURN_FALSE;
}
diff --git a/ext/odbc/php_velocis.h b/ext/odbc/php_velocis.h
index e5f9b1effd..d117cd4284 100644
--- a/ext/odbc/php_velocis.h
+++ b/ext/odbc/php_velocis.h
@@ -92,7 +92,7 @@ PHP_FUNCTION(velocis_rollback);
PHP_FUNCTION(velocis_fieldnum);
PHP_FUNCTION(velocis_fieldname);
-extern velocis_module php3_velocis_module;
+extern velocis_module php_velocis_module;
#else
diff --git a/ext/odbc/velocis.c b/ext/odbc/velocis.c
index b49fff2f24..6399fbe89a 100644
--- a/ext/odbc/velocis.c
+++ b/ext/odbc/velocis.c
@@ -69,7 +69,7 @@ zend_module_entry velocis_module_entry = {
zend_module_entry *get_module() { return &velocis_module_entry; }
#endif
-THREAD_LS velocis_module php3_velocis_module;
+THREAD_LS velocis_module php_velocis_module;
THREAD_LS static HENV henv;
static void _close_velocis_link(VConn *conn)
@@ -97,12 +97,12 @@ static void _free_velocis_result(Vresult *res)
PHP_MINIT_FUNCTION(velocis)
{
SQLAllocEnv(&henv);
- if ( cfg_get_long("velocis.max_links",&php3_velocis_module.max_links) == FAILURE ) {
- php3_velocis_module.max_links = -1;
+ if ( cfg_get_long("velocis.max_links",&php_velocis_module.max_links) == FAILURE ) {
+ php_velocis_module.max_links = -1;
}
- php3_velocis_module.num_links = 0;
- php3_velocis_module.le_link = register_list_destructors(_close_velocis_link,NULL);
- php3_velocis_module.le_result = register_list_destructors(_free_velocis_result,NULL);
+ php_velocis_module.num_links = 0;
+ php_velocis_module.le_link = register_list_destructors(_close_velocis_link,NULL);
+ php_velocis_module.le_result = register_list_destructors(_free_velocis_result,NULL);
return SUCCESS;
}
@@ -131,7 +131,7 @@ velocis_add_conn(HashTable *list,VConn *conn,HDBC hdbc)
{
int ind;
- ind = zend_list_insert(conn,php3_velocis_module.le_link);
+ ind = zend_list_insert(conn,php_velocis_module.le_link);
conn->hdbc = hdbc;
conn->index = ind;
@@ -145,7 +145,7 @@ velocis_find_conn(HashTable *list,int ind)
int type;
conn = zend_list_find(ind,&type);
- if ( !conn || type != php3_velocis_module.le_link ) {
+ if ( !conn || type != php_velocis_module.le_link ) {
return(NULL);
}
return(conn);
@@ -162,7 +162,7 @@ velocis_add_result(HashTable *list,Vresult *res,VConn *conn)
{
int ind;
- ind = zend_list_insert(res,php3_velocis_module.le_result);
+ ind = zend_list_insert(res,php_velocis_module.le_result);
res->conn = conn;
res->index = ind;
@@ -176,7 +176,7 @@ velocis_find_result(HashTable *list,int ind)
int type;
res = zend_list_find(ind,&type);
- if ( !res || type != php3_velocis_module.le_result ) {
+ if ( !res || type != php_velocis_module.le_result ) {
return(NULL);
}
return(res);
@@ -201,8 +201,8 @@ PHP_FUNCTION(velocis_connect)
VConn *new;
long ind;
- if ( php3_velocis_module.max_links != -1 && php3_velocis_module.num_links == php3_velocis_module.max_links ) {
- php_error(E_WARNING,"Velocis: Too many open connections (%d)",php3_velocis_module.num_links);
+ if ( php_velocis_module.max_links != -1 && php_velocis_module.num_links == php_velocis_module.max_links ) {
+ php_error(E_WARNING,"Velocis: Too many open connections (%d)",php_velocis_module.num_links);
RETURN_FALSE;
}
if ( ARG_COUNT(ht) != 3 ||
@@ -233,7 +233,7 @@ PHP_FUNCTION(velocis_connect)
RETURN_FALSE;
}
ind = velocis_add_conn(list,new,hdbc);
- php3_velocis_module.num_links++;
+ php_velocis_module.num_links++;
RETURN_LONG(ind);
}
@@ -254,7 +254,7 @@ PHP_FUNCTION(velocis_close)
SQLDisconnect(conn->hdbc);
SQLFreeConnect(conn->hdbc);
velocis_del_conn(list,id->value.lval);
- php3_velocis_module.num_links--;
+ php_velocis_module.num_links--;
RETURN_TRUE;
}
View Lorry Controller Status