cvs: php4 /ext/mssql php_mssql.c

fmk Mon Jul 30 13:27:08 2001 EDT Modified files: /php4/ext/mssql php_mssql.c Log: Fixing build after implementing the new TSRM structure! Index: php4/ext/mssql/php_mssql.c diff -u php4/ext/mssql/php_mssql.c:1.61 php4/ext/mssql/php_mssql.c:1.62 --- php4/ext/mssql/php_mssql.c:1.61 Mon Jul 30 04:24:29 2001 +++ php4/ext/mssql/php_mssql.c Mon Jul 30 13:27:08 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.61 2001/07/30 08:24:29 zeev Exp $ */ +/* $Id: php_mssql.c,v 1.62 2001/07/30 17:27:08 fmk Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -250,19 +250,6 @@ MS_SQL_G(num_links)--; } -static mssql_statement* _mssql_get_statement(zval **stmt) -{ - mssql_statement *statement; - - statement = (mssql_statement *) zend_fetch_resource(stmt TSRMLS_CC, -1, "MS SQL-Statement", NULL, 1, le_statement); - - if (statement) { - return statement; - } else { - return (mssql_statement *) NULL; - } -} - static void _mssql_bind_hash_dtor(void *data) { mssql_bind *bind= (mssql_bind *) data; @@ -274,12 +261,12 @@ { long compatability_mode; - MS_SQL_G(num_persistent) = 0; + mssql_globals->num_persistent = 0; if (cfg_get_long("mssql.compatability_mode", &compatability_mode) == SUCCESS) { if (compatability_mode) { - MS_SQL_G(get_column_content) = php_mssql_get_column_content_without_type; + mssql_globals->get_column_content = php_mssql_get_column_content_without_type; } else { - MS_SQL_G(get_column_content) = php_mssql_get_column_content_with_type; + mssql_globals->get_column_content = php_mssql_get_column_content_with_type; } } } @@ -646,7 +633,7 @@ } -static int php_mssql_get_default_link(INTERNAL_FUNCTION_PARAMETERS TSRMLS_DC) +static int php_mssql_get_default_link(INTERNAL_FUNCTION_PARAMETERS) { if (MS_SQL_G(default_link)==-1) { /* no link opened yet, implicitly open one */ ht = 0; @@ -683,7 +670,7 @@ switch (ZEND_NUM_ARGS()) { case 0: - id = php_mssql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC); + id = php_mssql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); CHECK_LINK(id); break; case 1: @@ -721,7 +708,7 @@ if (zend_get_parameters_ex(1, &db)==FAILURE) { RETURN_FALSE; } - id = php_mssql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC); + id = php_mssql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); CHECK_LINK(id); break; case 2: @@ -983,7 +970,7 @@ if (zend_get_parameters_ex(1, &query)==FAILURE) { RETURN_FALSE; } - id = php_mssql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC); + id = php_mssql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); CHECK_LINK(id); break; case 2: @@ -1688,7 +1675,7 @@ if (zend_get_parameters_ex(1, &sp_name)==FAILURE) { RETURN_FALSE; } - id = php_mssql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC); + id = php_mssql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); CHECK_LINK(id); break; @@ -1815,7 +1802,7 @@ } /* END input validation */ - statement = _mssql_get_statement(stmt); + ZEND_FETCH_RESOURCE(statement, mssql_statement *, stmt, -1, "MS SQL-Statement", le_statement); if (statement==NULL) { RETURN_FALSE; } @@ -1914,10 +1901,8 @@ WRONG_PARAM_COUNT; } - statement = _mssql_get_statement(stmt); - if (statement==NULL) { - RETURN_FALSE; - } + ZEND_FETCH_RESOURCE(statement, mssql_statement *, stmt, -1, "MS SQL-Statement", le_statement); + mssql_ptr=statement->link; if (dbrpcexec(mssql_ptr->link)==FAIL || dbsqlok(mssql_ptr->link)==FAIL) {