Fixing build after implementing the new TSRM structure!

2 files changed, 37 insertions, 52 deletions

diff --git a/ext/fbsql/php_fbsql.c b/ext/fbsql/php_fbsql.c
index 94d501b58e..6cfbf67a28 100644
--- a/ext/fbsql/php_fbsql.c
+++ b/ext/fbsql/php_fbsql.c
@@ -316,7 +316,7 @@ static void php_fbsql_set_default_link(int id TSRMLS_DC)
 	zend_list_addref(id);
 }
 
-static int php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAMETERS TSRMLS_DC)
+static int php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAMETERS)
 {
 	if (FB_SQL_G(linkIndex)==-1) { /* no link opened yet, implicitly open one */
 		ht = 0;
@@ -627,7 +627,7 @@ PHP_FUNCTION(fbsql_close)
 
 	switch (ZEND_NUM_ARGS()) {
 		case 0:
-			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 			CHECK_LINK(id);
 			break;
 		case 1:
@@ -788,7 +788,7 @@ PHP_FUNCTION(fbsql_commit)
 
 	switch (ZEND_NUM_ARGS()) {
 		case 0:
-			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 			CHECK_LINK(id);
 			break;
 		case 1:
@@ -825,7 +825,7 @@ PHP_FUNCTION(fbsql_rollback)
 
 	switch (ZEND_NUM_ARGS()) {
 		case 0:
-			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 			CHECK_LINK(id);
 			break;
 		case 1:
@@ -1033,11 +1033,11 @@ PHP_FUNCTION(fbsql_select_db)
 	switch (ZEND_NUM_ARGS()) {
 		case 0:
 			name = FB_SQL_G(databaseName);
-			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 			CHECK_LINK(id);
 			break;
 		case 1:
-			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 			CHECK_LINK(id);
 			if (zend_get_parameters_ex(1, &dbname)==FAILURE) {
 				RETURN_FALSE;
@@ -1089,14 +1089,14 @@ PHP_FUNCTION(fbsql_change_user)
 	switch (ZEND_NUM_ARGS()) {
 		case 2:
 			name = FB_SQL_G(databaseName);
-			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 			CHECK_LINK(id);
 			if (zend_get_parameters_ex(2, &user, &password)==FAILURE) {
 				RETURN_FALSE;
 			}
 			break;
 		case 3:
-			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 			CHECK_LINK(id);
 			if (zend_get_parameters_ex(3, &user, &password, &database)==FAILURE) {
 				RETURN_FALSE;
@@ -1147,7 +1147,7 @@ PHP_FUNCTION(fbsql_create_db)
 
 	switch (ZEND_NUM_ARGS()) {
 		case 1:
-			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 			CHECK_LINK(id);
 			if (zend_get_parameters_ex(1, &database_name)==FAILURE) {
 				RETURN_FALSE;
@@ -1217,7 +1217,7 @@ PHP_FUNCTION(fbsql_drop_db)
 
 	switch (ZEND_NUM_ARGS()) {
 		case 1:
-			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 			CHECK_LINK(id);
 			if (zend_get_parameters_ex(1, &database_name)==FAILURE) {
 				RETURN_FALSE;
@@ -1288,7 +1288,7 @@ PHP_FUNCTION(fbsql_start_db)
 
 	switch (ZEND_NUM_ARGS()) {
 		case 1:
-			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 			CHECK_LINK(id);
 			if (zend_get_parameters_ex(1, &database_name)==FAILURE) {
 				RETURN_FALSE;
@@ -1363,7 +1363,7 @@ PHP_FUNCTION(fbsql_stop_db)
 
 	switch (ZEND_NUM_ARGS()) {
 		case 1:
-			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 			CHECK_LINK(id);
 			if (zend_get_parameters_ex(1, &database_name)==FAILURE) {
 				RETURN_FALSE;
@@ -1420,7 +1420,7 @@ PHP_FUNCTION(fbsql_db_status)
 
 	switch (ZEND_NUM_ARGS()) {
 		case 1:
-			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 			CHECK_LINK(id);
 			if (zend_get_parameters_ex(1, &database_name)==FAILURE) {
 				RETURN_FALSE;
@@ -1583,7 +1583,7 @@ PHP_FUNCTION(fbsql_query)
 
 	switch (ZEND_NUM_ARGS()) {
 		case 1:
-			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 			CHECK_LINK(id);
 			if (zend_get_parameters_ex(1, &query)==FAILURE) {
 				RETURN_FALSE;
@@ -1617,7 +1617,7 @@ PHP_FUNCTION(fbsql_db_query)
 
 	switch (ZEND_NUM_ARGS()) {
 		case 2:
-			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 			CHECK_LINK(id);
 			if (zend_get_parameters_ex(2, &dbname, &query)==FAILURE) {
 				RETURN_FALSE;
@@ -1646,7 +1646,7 @@ PHP_FUNCTION(fbsql_db_query)
 }
 /* }}} */
 
-/* {{{ proto int fbsql_list_dbs([resource link_identifier])
+/* {{{ proto resource fbsql_list_dbs([resource link_identifier])
 	*/
 PHP_FUNCTION(fbsql_list_dbs)
 {
@@ -1657,7 +1657,7 @@ PHP_FUNCTION(fbsql_list_dbs)
 
 	switch (ZEND_NUM_ARGS()) {
 		case 0:
-			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 			CHECK_LINK(id);
 			break;
 		case 1:
@@ -1691,7 +1691,7 @@ PHP_FUNCTION(fbsql_list_dbs)
 }
 /* }}} */
 
-/* {{{ proto int fbsql_list_tables(string database, int [link_identifier]);
+/* {{{ proto resource fbsql_list_tables(string database, int [link_identifier]);
 	*/
 PHP_FUNCTION(fbsql_list_tables)
 {
@@ -1703,7 +1703,7 @@ PHP_FUNCTION(fbsql_list_tables)
 
 	switch (ZEND_NUM_ARGS()) {
 		case 1:
-			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 			CHECK_LINK(id);
 			if (zend_get_parameters_ex(1, &database_name)==FAILURE) {
 				RETURN_FALSE;
@@ -1734,7 +1734,7 @@ PHP_FUNCTION(fbsql_list_tables)
 }
 /* }}} */
 
-/* {{{ proto int fbsql_list_fields(string database_name, string table_name [, resource link_identifier])
+/* {{{ proto resource fbsql_list_fields(string database_name, string table_name [, resource link_identifier])
 	*/
 PHP_FUNCTION(fbsql_list_fields)
 {
@@ -1746,7 +1746,7 @@ PHP_FUNCTION(fbsql_list_fields)
 
 	switch (ZEND_NUM_ARGS()) {
 		case 2:
-			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 			CHECK_LINK(id);
 			if (zend_get_parameters_ex(2, &database_name, &table_name)==FAILURE) {
 				RETURN_FALSE;
@@ -1789,7 +1789,7 @@ PHP_FUNCTION(fbsql_error)
 
 	switch (ZEND_NUM_ARGS()) {
 		case 0:
-			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 			CHECK_LINK(id);
 			break;
 		case 1:
@@ -1823,7 +1823,7 @@ PHP_FUNCTION(fbsql_errno)
 
 	switch (ZEND_NUM_ARGS()) {
 		case 0:
-			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 			CHECK_LINK(id);
 			break;
 		case 1:
@@ -1870,7 +1870,7 @@ PHP_FUNCTION(fbsql_affected_rows)
 
 	switch (ZEND_NUM_ARGS()) {
 		case 0:
-			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 			CHECK_LINK(id);
 			break;
 		case 1:
@@ -1899,7 +1899,7 @@ PHP_FUNCTION(fbsql_insert_id)
 
 	switch (ZEND_NUM_ARGS()) {
 		case 0:
-			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 			CHECK_LINK(id);
 			break;
 		case 1:
@@ -2989,7 +2989,7 @@ PHP_FUNCTION(fbsql_get_autostart_info)
 
 	switch (ZEND_NUM_ARGS()) {
 		case 0:
-			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+			id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 			CHECK_LINK(id);
 			break;
 		case 1:
diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index c63a887640..2371a94216 100644
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -250,19 +250,6 @@ static void _close_mssql_plink(zend_rsrc_list_entry *rsrc)
 	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 @@ static void php_mssql_init_globals(zend_mssql_globals *mssql_globals)
 {
 	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 void php_mssql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 }
 
 
-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 @@ PHP_FUNCTION(mssql_close)
 	
 	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 @@ PHP_FUNCTION(mssql_select_db)
 			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 @@ PHP_FUNCTION(mssql_query)
 			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 @@ PHP_FUNCTION(mssql_init)
 			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 @@ PHP_FUNCTION(mssql_bind)
 	}
 	/* 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 @@ PHP_FUNCTION(mssql_execute)
         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) {