ZTS fixes

diff --git a/ext/ingres_ii/ii.c b/ext/ingres_ii/ii.c
index 22715360fda9fb183c7e24a33a3c31a4abcdddba..6b3e20f4e515922694d14c61e9bc97401d1876a0 100644 (file)
--- a/ext/ingres_ii/ii.c
+++ b/ext/ingres_ii/ii.c
@@ -948,7 +948,7 @@ static void php_ii_field_info(INTERNAL_FUNCTION_PARAMETERS, int info_type)
        switch (info_type) {
 
                case II_FIELD_INFO_NAME:
-                       name = php_ii_field_name(ii_link, index);
+                       name = php_ii_field_name(ii_link, index TSRMLS_CC);
                        if (name == NULL) {
                                RETURN_FALSE;
                        }
@@ -1037,7 +1037,7 @@ static void php_ii_field_info(INTERNAL_FUNCTION_PARAMETERS, int info_type)
 
 /* Return the name of a field in a query result
 */
-static char *php_ii_field_name(II_LINK *ii_link, int index)
+static char *php_ii_field_name(II_LINK *ii_link, int index TSRMLS_DC)
 {
        if (index < 1 || index > ii_link->fieldCount) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Ingres II:  php_ii_field_name() called with wrong index (%d)", index);
@@ -1206,7 +1206,7 @@ static void php_ii_fetch(INTERNAL_FUNCTION_PARAMETERS, II_LINK *ii_link, int res
                                                        add_index_null(return_value, i + k - 1);
                                                }
                                                if (result_type & II_ASSOC) {
-                                                       add_assoc_null(return_value, php_ii_field_name(ii_link, i + k - 1));
+                                                       add_assoc_null(return_value, php_ii_field_name(ii_link, i + k - 1 TSRMLS_CC));
                                                }
 
                                        } else {        /* non NULL value */
@@ -1241,7 +1241,7 @@ static void php_ii_fetch(INTERNAL_FUNCTION_PARAMETERS, II_LINK *ii_link, int res
                                                                }
 
                                                                if (result_type & II_ASSOC) {
-                                                                       add_assoc_double(return_value, php_ii_field_name(ii_link, i + k - 1), value_double);
+                                                                       add_assoc_double(return_value, php_ii_field_name(ii_link, i + k - 1 TSRMLS_CC), value_double);
                                                                }
                                                                break;
 
@@ -1270,7 +1270,7 @@ static void php_ii_fetch(INTERNAL_FUNCTION_PARAMETERS, II_LINK *ii_link, int res
                                                                }
        
                                                                if (result_type & II_ASSOC) {
-                                                                       add_assoc_long(return_value, php_ii_field_name(ii_link, i + k - 1), value_long);
+                                                                       add_assoc_long(return_value, php_ii_field_name(ii_link, i + k - 1 TSRMLS_CC), value_long);
                                                                }
                                                                break;
 
@@ -1311,7 +1311,7 @@ static void php_ii_fetch(INTERNAL_FUNCTION_PARAMETERS, II_LINK *ii_link, int res
                                                                }
 
                                                                if (result_type & II_ASSOC) {
-                                                                       add_assoc_stringl(return_value, php_ii_field_name (ii_link, i + k - 1), value_char_p, len, should_copy);
+                                                                       add_assoc_stringl(return_value, php_ii_field_name(ii_link, i + k - 1 TSRMLS_CC), value_char_p, len, should_copy);
                                                                }
 
                                                                /* eventualy restore data pointer state for

diff --git a/ext/ingres_ii/ii.h b/ext/ingres_ii/ii.h
index 977094452d81fb567751e7d13cbd6387fcdc5ea6..0ca02b2853a5e8ce40df98168fbcaf6e37aed0f5 100644 (file)
--- a/ext/ingres_ii/ii.h
+++ b/ext/ingres_ii/ii.h
@@ -43,13 +43,13 @@ static int ii_success(IIAPI_GENPARM *genParm);
 #define II_OK 1
 #define II_NO_DATA 2
 static int _close_statement(II_LINK *link);
-static int _rollback_transaction(II_LINK *link);
+static int _rollback_transaction(II_LINK *link TSRMLS_DC);
 static void _close_ii_link(II_LINK *link TSRMLS_DC);
 static void _close_ii_plink(zend_rsrc_list_entry *link TSRMLS_DC);
 static int php_ii_get_default_link(INTERNAL_FUNCTION_PARAMETERS);
 static void php_ii_set_default_link(int id TSRMLS_DC);
 static void php_ii_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent);
-static char *php_ii_field_name(II_LINK *ii_link, int index);
+static char *php_ii_field_name(II_LINK *ii_link, int index TSRMLS_DC);
 static void php_ii_field_info(INTERNAL_FUNCTION_PARAMETERS, int info_type);
 static void php_ii_fetch(INTERNAL_FUNCTION_PARAMETERS, II_LINK *ii_link, int result_type);