more tsrm cleanup

22 files changed, 96 insertions, 107 deletions

diff --git a/ext/db/db.c b/ext/db/db.c
index 522e3b6466..9d2f8c10bc 100644
--- a/ext/db/db.c
+++ b/ext/db/db.c
@@ -497,7 +497,7 @@ PHP_FUNCTION(dbminsert)
 		RETURN_FALSE;
 	}
 	
-	ret = php_dbm_insert(info, Z_STRVAL_P(key), Z_STRVAL_P(value));
+	ret = php_dbm_insert(info, Z_STRVAL_P(key), Z_STRVAL_P(value) TSRMLS_CC);
 	RETURN_LONG(ret);
 }
 /* }}} */
@@ -505,13 +505,13 @@ PHP_FUNCTION(dbminsert)
 
 /* {{{ php_dbm_insert
  */
-int php_dbm_insert(dbm_info *info, char *key, char *value) {
+int php_dbm_insert(dbm_info *info, char *key, char *value TSRMLS_DC) {
 	datum key_datum, value_datum;
 	int ret;
 	DBM_TYPE dbf;
 
-	php_stripslashes(key,NULL);
-	php_stripslashes(value,NULL);
+	php_stripslashes(key, NULL TSRMLS_CC);
+	php_stripslashes(value, NULL TSRMLS_CC);
 
 	value_datum.dptr = estrdup(value);
 	value_datum.dsize = strlen(value);
@@ -571,8 +571,8 @@ int php_dbm_replace(dbm_info *info, char *key, char *value TSRMLS_DC)
 	datum key_datum, value_datum;
 
 	if (PG(magic_quotes_runtime)) {
-		php_stripslashes(key,NULL);
-		php_stripslashes(value,NULL);
+		php_stripslashes(key, NULL TSRMLS_CC);
+		php_stripslashes(value, NULL TSRMLS_CC);
 	}
 
 	value_datum.dptr = estrdup(value);
@@ -669,7 +669,7 @@ char *php_dbm_fetch(dbm_info *info, char *key TSRMLS_DC)
 		ret = NULL;
 
 	if (ret && PG(magic_quotes_runtime)) {
-		ret = php_addslashes(ret, value_datum.dsize, NULL, 1);
+		ret = php_addslashes(ret, value_datum.dsize, NULL, 1 TSRMLS_CC);
 	}
 	return(ret);
 }
@@ -903,7 +903,7 @@ char *php_dbm_nextkey(dbm_info *info, char *key TSRMLS_DC)
 	else ret=NULL;
 
 	if (ret && PG(magic_quotes_runtime)) {
-		ret = php_addslashes(ret, ret_datum.dsize, NULL, 1);
+		ret = php_addslashes(ret, ret_datum.dsize, NULL, 1 TSRMLS_CC);
 	}
 	return(ret);
 }
diff --git a/ext/db/php_db.h b/ext/db/php_db.h
index 61c3a48e86..11faefacbe 100644
--- a/ext/db/php_db.h
+++ b/ext/db/php_db.h
@@ -54,7 +54,7 @@ typedef struct dbm_info {
 dbm_info *php_find_dbm(pval *id);
 int php_dbm_close(zend_rsrc_list_entry *rsrc TSRMLS_DC);
 dbm_info *php_dbm_open(char *filename, char *mode);
-int php_dbm_insert(dbm_info *info, char *key, char *value);
+int php_dbm_insert(dbm_info *info, char *key, char *value TSRMLS_DC);
 char *php_dbm_fetch(dbm_info *info, char *key);
 int php_dbm_replace(dbm_info *info, char *key, char *value);
 int php_dbm_exists(dbm_info *info, char *key);
diff --git a/ext/ingres_ii/ii.c b/ext/ingres_ii/ii.c
index c32ae42695..ee60350fb4 100644
--- a/ext/ingres_ii/ii.c
+++ b/ext/ingres_ii/ii.c
@@ -990,7 +990,7 @@ PHP_FUNCTION(ingres_field_scale)
 
 /* Fetch a row of result
 */
-static void php_ii_fetch(INTERNAL_FUNCTION_PARAMETERS, II_LINK *ii_link, int result_type)
+static void php_ii_fetch(INTERNAL_FUNCTION_PARAMETERS, II_LINK *ii_link, int result_type TSRMLS_DC)
 {
   IIAPI_GETCOLPARM getColParm;
   IIAPI_DATAVALUE *columnData;
@@ -1133,7 +1133,7 @@ static void php_ii_fetch(INTERNAL_FUNCTION_PARAMETERS, II_LINK *ii_link, int res
 	      }
 	      /* use php_addslashes if asked to */
 	      if(PG(magic_quotes_runtime)) {
-		value_char_p = php_addslashes((char *) columnData[k-1].dv_value,columnData[k-1].dv_length,&len,0);
+		value_char_p = php_addslashes((char *) columnData[k-1].dv_value,columnData[k-1].dv_length,&len,0 TSRMLS_CC);
 		should_copy = 0;
 	      } else {
 		value_char_p = (char *) columnData[k-1].dv_value;
@@ -1198,7 +1198,7 @@ PHP_FUNCTION(ingres_fetch_array)
   ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id, "Ingres II Link", le_ii_link, le_ii_plink);
 
   php_ii_fetch(INTERNAL_FUNCTION_PARAM_PASSTHRU, ii_link,
-	       (argc == 0 ? II_BOTH : Z_LVAL_PP(result_type)));
+	       (argc == 0 ? II_BOTH : Z_LVAL_PP(result_type)) TSRMLS_CC);
 }
 /* }}} */
 
@@ -1222,7 +1222,7 @@ PHP_FUNCTION(ingres_fetch_row)
 
   ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id, "Ingres II Link", le_ii_link, le_ii_plink);
 
-  php_ii_fetch(INTERNAL_FUNCTION_PARAM_PASSTHRU, ii_link, II_NUM);
+  php_ii_fetch(INTERNAL_FUNCTION_PARAM_PASSTHRU, ii_link, II_NUM TSRMLS_CC);
 }
 /* }}} */
 
@@ -1251,7 +1251,7 @@ PHP_FUNCTION(ingres_fetch_object)
   ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id, "Ingres II Link", le_ii_link, le_ii_plink);
 
   php_ii_fetch(INTERNAL_FUNCTION_PARAM_PASSTHRU, ii_link,
-	       (argc == 0 ? II_BOTH : Z_LVAL_PP(result_type)));
+	       (argc == 0 ? II_BOTH : Z_LVAL_PP(result_type)) TSRMLS_CC);
   if(Z_TYPE_P(return_value)==IS_ARRAY) {
     convert_to_object(return_value);
   }
diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c
index 5d50ee97a8..b4df082631 100644
--- a/ext/interbase/interbase.c
+++ b/ext/interbase/interbase.c
@@ -1673,10 +1673,9 @@ PHP_FUNCTION(ibase_query)
 /* }}} */
 
 /* {{{ _php_ibase_var_pval() */
-static int _php_ibase_var_pval(pval *val, void *data, int type, int len, int scale, int flag)
+static int _php_ibase_var_pval(pval *val, void *data, int type, int len, int scale, int flag TSRMLS_DC)
 {
 	char string_data[255];
-	TSRMLS_FETCH();
 	
 	switch(type & ~1) {
 		case SQL_VARYING:
@@ -1688,7 +1687,7 @@ static int _php_ibase_var_pval(pval *val, void *data, int type, int len, int sca
 			memcpy(val->value.str.val, data, len);
 			val->value.str.val[len] = '\0';
 			if (PG(magic_quotes_runtime)) {
-				val->value.str.val = php_addslashes(val->value.str.val, len, &len, 1);
+				val->value.str.val = php_addslashes(val->value.str.val, len, &len, 1 TSRMLS_CC);
             }
 			val->type = IS_STRING;
 			val->value.str.len = len;
@@ -1811,7 +1810,7 @@ static int _php_ibase_var_pval(pval *val, void *data, int type, int len, int sca
 /* {{{ _php_ibase_arr_pval() */
 /* create multidimension array - resursion function
  (*datap) argument changed */
-static int _php_ibase_arr_pval(pval *ar_pval, char **datap, ibase_array *ib_array, int dim, int flag)
+static int _php_ibase_arr_pval(pval *ar_pval, char **datap, ibase_array *ib_array, int dim, int flag TSRMLS_DC)
 {
 	pval tmp;
 	int i, dim_len, l_bound, u_bound;
@@ -1829,7 +1828,7 @@ static int _php_ibase_arr_pval(pval *ar_pval, char **datap, ibase_array *ib_arra
 	if (dim < ib_array->ar_desc.array_desc_dimensions - 1) { /* array again */
 		for (i = 0; i < dim_len; i++) {
 			/* recursion here */
-			if (_php_ibase_arr_pval(ar_pval, datap, ib_array, dim+1, flag) == FAILURE) {
+			if (_php_ibase_arr_pval(ar_pval, datap, ib_array, dim+1, flag TSRMLS_CC) == FAILURE) {
 				return FAILURE;
 			}
 		}
@@ -1841,7 +1840,7 @@ static int _php_ibase_arr_pval(pval *ar_pval, char **datap, ibase_array *ib_arra
 			if (_php_ibase_var_pval(&tmp, *datap, ib_array->el_type,
 									ib_array->ar_desc.array_desc_length,
 									ib_array->ar_desc.array_desc_scale,
-									flag) == FAILURE){
+									flag TSRMLS_CC) == FAILURE){
 				return FAILURE;
 			}
 			/* FIXME ??? */
@@ -1937,7 +1936,7 @@ static void _php_ibase_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int fetch_type)
 				case SQL_TYPE_DATE:
 				case SQL_TYPE_TIME:
 #endif
-					_php_ibase_var_pval(tmp, var->sqldata, var->sqltype, var->sqllen, var->sqlscale, flag);
+					_php_ibase_var_pval(tmp, var->sqldata, var->sqltype, var->sqllen, var->sqlscale, flag TSRMLS_CC);
 					break;
 				case SQL_BLOB:
 					if (flag & PHP_IBASE_TEXT) { /* text ? */
@@ -2030,7 +2029,7 @@ static void _php_ibase_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int fetch_type)
 					}
 					
 					tmp_ptr = ar_data; /* avoid changes in _arr_pval */
-					if (_php_ibase_arr_pval(tmp, &tmp_ptr, ib_array, 0, flag) == FAILURE) {
+					if (_php_ibase_arr_pval(tmp, &tmp_ptr, ib_array, 0, flag TSRMLS_CC) == FAILURE) {
 						RETURN_FALSE;
 					}
 					efree(ar_data);
diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c
index 34eb5526fe..a4441c6823 100644
--- a/ext/msql/php_msql.c
+++ b/ext/msql/php_msql.c
@@ -844,7 +844,7 @@ PHP_FUNCTION(msql_result)
 	
 	if (sql_row[field_offset]) {
 		if (PG(magic_quotes_runtime)) {
-			return_value->value.str.val = php_addslashes(sql_row[field_offset],0,&return_value->value.str.len,0);
+			return_value->value.str.val = php_addslashes(sql_row[field_offset],0,&return_value->value.str.len,0 TSRMLS_CC);
 		} else {	
 			return_value->value.str.len = (sql_row[field_offset]?strlen(sql_row[field_offset]):0);
 			return_value->value.str.val = (char *) safe_estrndup(sql_row[field_offset],return_value->value.str.len);
@@ -943,7 +943,7 @@ static void php_msql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
 			int should_copy;
 
 			if (PG(magic_quotes_runtime)) {
-				data = php_addslashes(msql_row[i], 0, &data_len, 0);
+				data = php_addslashes(msql_row[i], 0, &data_len, 0 TSRMLS_CC);
 				should_copy = 0;
 			} else {
 				data = msql_row[i];
diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index 1bf673bddd..f10dfadaa6 100644
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -1166,7 +1166,7 @@ static void php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
 
 			if (Z_TYPE(result->data[result->cur_row][i]) == IS_STRING) {
 				if (PG(magic_quotes_runtime)) {
-					data = php_addslashes(Z_STRVAL(result->data[result->cur_row][i]), Z_STRLEN(result->data[result->cur_row][i]), &result->data[result->cur_row][i].value.str.len, 1);
+					data = php_addslashes(Z_STRVAL(result->data[result->cur_row][i]), Z_STRLEN(result->data[result->cur_row][i]), &result->data[result->cur_row][i].value.str.len, 1 TSRMLS_CC);
 					should_copy = 0;
 				}
 				else
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 42c8b793f9..19aa221f2e 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -1462,7 +1462,7 @@ PHP_FUNCTION(mysql_result)
 		return_value->type = IS_STRING;
 
 		if (PG(magic_quotes_runtime)) {
-			return_value->value.str.val = php_addslashes(sql_row[field_offset], sql_row_lengths[field_offset],&return_value->value.str.len, 0);
+			return_value->value.str.val = php_addslashes(sql_row[field_offset], sql_row_lengths[field_offset],&return_value->value.str.len, 0 TSRMLS_CC);
 		} else {	
 			return_value->value.str.len = sql_row_lengths[field_offset];
 			return_value->value.str.val = (char *) safe_estrndup(sql_row[field_offset], return_value->value.str.len);
@@ -1569,7 +1569,7 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type,
 			int should_copy;
 
 			if (PG(magic_quotes_runtime)) {
-				data = php_addslashes(mysql_row[i], mysql_row_lengths[i],&data_len, 0);
+				data = php_addslashes(mysql_row[i], mysql_row_lengths[i],&data_len, 0 TSRMLS_CC);
 				should_copy = 0;
 			} else {
 				data = mysql_row[i];
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index a660ec9528..bae6f8fa80 100644
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -569,7 +569,7 @@ static int preg_do_repl_func(zval *function, char *subject, int *offsets, int co
 /* {{{ preg_do_eval
  */
 static int preg_do_eval(char *eval_str, int eval_str_len, char *subject,
-						int *offsets, int count, char **result)
+						int *offsets, int count, char **result TSRMLS_DC)
 {
 	zval		 retval;			/* Return value from evaluation */
 	char		*eval_str_end,		/* End of eval string */
@@ -584,7 +584,6 @@ static int preg_do_eval(char *eval_str, int eval_str_len, char *subject,
 	int			 backref;			/* Current backref */
 	char        *compiled_string_description;
 	smart_str    code = {0};
-	TSRMLS_FETCH();
 	
 	eval_str_end = eval_str + eval_str_len;
 	walk = segment = eval_str;
@@ -608,7 +607,7 @@ static int preg_do_eval(char *eval_str, int eval_str_len, char *subject,
 					match = subject + offsets[backref<<1];
 					match_len = offsets[(backref<<1)+1] - offsets[backref<<1];
 					if (match_len)
-						esc_match = php_addslashes(match, match_len, &esc_match_len, 0);
+						esc_match = php_addslashes(match, match_len, &esc_match_len, 0 TSRMLS_CC);
 					else {
 						esc_match = match;
 						esc_match_len = 0;
@@ -663,7 +662,7 @@ static int preg_do_eval(char *eval_str, int eval_str_len, char *subject,
 char *php_pcre_replace(char *regex,   int regex_len,
 					   char *subject, int subject_len,
 					   zval *replace_val, int is_callable_replace,
-					   int *result_len, int limit)
+					   int *result_len, int limit TSRMLS_DC)
 {
 	pcre			*re = NULL;			/* Compiled regular expression */
 	pcre_extra		*extra = NULL;		/* Holds results of studying */
@@ -745,7 +744,7 @@ char *php_pcre_replace(char *regex,   int regex_len,
 			/* If evaluating, do it and add the return string's length */
 			if (eval) {
 				eval_result_len = preg_do_eval(replace, replace_len, subject,
-											   offsets, count, &eval_result);
+											   offsets, count, &eval_result TSRMLS_CC);
 				new_len += eval_result_len;
 			} else if (is_callable_replace) {
 				/* Use custom function to get replacement string and its length. */
@@ -871,7 +870,7 @@ char *php_pcre_replace(char *regex,   int regex_len,
 
 /* {{{ php_replace_in_subject
  */
-static char *php_replace_in_subject(zval *regex, zval *replace, zval **subject, int *result_len, int limit, zend_bool is_callable_replace)
+static char *php_replace_in_subject(zval *regex, zval *replace, zval **subject, int *result_len, int limit, zend_bool is_callable_replace TSRMLS_DC)
 {
 	zval		**regex_entry,
 				**replace_entry = NULL,
@@ -924,7 +923,7 @@ static char *php_replace_in_subject(zval *regex, zval *replace, zval **subject,
 										   replace_value,
 										   is_callable_replace,
 										   result_len,
-										   limit)) != NULL) {
+										   limit TSRMLS_CC)) != NULL) {
 				efree(subject_value);
 				subject_value = result;
 				subject_len = *result_len;
@@ -942,7 +941,7 @@ static char *php_replace_in_subject(zval *regex, zval *replace, zval **subject,
 								  replace,
 								  is_callable_replace,
 								  result_len,
-								  limit);
+								  limit TSRMLS_CC);
 		return result;
 	}
 }
@@ -1004,7 +1003,7 @@ static void preg_replace_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_callabl
 		/* For each subject entry, convert it to string, then perform replacement
 		   and add the result to the return_value array. */
 		while (zend_hash_get_current_data(Z_ARRVAL_PP(subject), (void **)&subject_entry) == SUCCESS) {
-			if ((result = php_replace_in_subject(*regex, *replace, subject_entry, &result_len, limit_val, is_callable_replace)) != NULL) {
+			if ((result = php_replace_in_subject(*regex, *replace, subject_entry, &result_len, limit_val, is_callable_replace TSRMLS_CC)) != NULL) {
 				/* Add to return array */
 				switch(zend_hash_get_current_key(Z_ARRVAL_PP(subject), &string_key, &num_key, 0))
 				{
@@ -1022,7 +1021,7 @@ static void preg_replace_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_callabl
 		}
 	}
 	else {	/* if subject is not an array */
-		if ((result = php_replace_in_subject(*regex, *replace, subject, &result_len, limit_val, is_callable_replace)) != NULL) {
+		if ((result = php_replace_in_subject(*regex, *replace, subject, &result_len, limit_val, is_callable_replace TSRMLS_CC)) != NULL) {
 			RETVAL_STRINGL(result, result_len, 0);
 		}
 	}	
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 81fef71dcf..fcf9271ab1 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -1208,7 +1208,7 @@ static void php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
 				int should_copy=0;
 
 				if (PG(magic_quotes_runtime)) {
-					data = php_addslashes(element, element_len, &data_len, 0);
+					data = php_addslashes(element, element_len, &data_len, 0 TSRMLS_CC);
 				} else {
 					data = safe_estrndup(element, element_len);
 					data_len = element_len;
diff --git a/ext/session/session.c b/ext/session/session.c
index 7eb820cb22..9d2953610f 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -471,7 +471,7 @@ static char *_php_create_id(int *newlen TSRMLS_DC)
 	gettimeofday(&tv, NULL);
 	PHP_MD5Init(&context);
 	
-	sprintf(buf, "%ld%ld%0.8f", tv.tv_sec, tv.tv_usec, php_combined_lcg() * 10);
+	sprintf(buf, "%ld%ld%0.8f", tv.tv_sec, tv.tv_usec, php_combined_lcg(TSRMLS_C) * 10);
 	PHP_MD5Update(&context, buf, strlen(buf));
 
 	if (PS(entropy_length) > 0) {
@@ -888,7 +888,7 @@ static void php_session_start(TSRMLS_D)
 	if (PS(mod_data) && PS(gc_probability) > 0) {
 		int nrdels = -1;
 
-		nrand = (int) (100.0*php_combined_lcg());
+		nrand = (int) (100.0*php_combined_lcg(TSRMLS_C));
 		if (nrand < PS(gc_probability)) {
 			PS(mod)->gc(&PS(mod_data), PS(gc_maxlifetime), &nrdels);
 #if 0
diff --git a/ext/standard/array.c b/ext/standard/array.c
index f18621ad1d..fd93b76f57 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -96,10 +96,8 @@ PHP_MSHUTDOWN_FUNCTION(array)
     return SUCCESS;
 }
 
-static void set_compare_func(int sort_type)
+static void set_compare_func(int sort_type TSRMLS_DC)
 {
-	TSRMLS_FETCH();
-
 	switch (sort_type) {
 		case SORT_NUMERIC:
 			ARRAYG(compare_func) = numeric_compare_function;
@@ -197,7 +195,7 @@ PHP_FUNCTION(krsort)
 		convert_to_long_ex(sort_type);
 		sort_type_val = Z_LVAL_PP(sort_type);
 	}
-	set_compare_func(sort_type_val);
+	set_compare_func(sort_type_val TSRMLS_CC);
 	if (zend_hash_sort(target_hash, qsort, array_reverse_key_compare, 0) == FAILURE) {
 		return;
 	}
@@ -226,7 +224,7 @@ PHP_FUNCTION(ksort)
 		convert_to_long_ex(sort_type);
 		sort_type_val = Z_LVAL_PP(sort_type);
 	}
-	set_compare_func(sort_type_val);
+	set_compare_func(sort_type_val TSRMLS_CC);
 	if (zend_hash_sort(target_hash, qsort, array_key_compare,0) == FAILURE) {
 		return;
 	}
@@ -421,7 +419,7 @@ PHP_FUNCTION(asort)
 		convert_to_long_ex(sort_type);
 		sort_type_val = Z_LVAL_PP(sort_type);
 	}
-	set_compare_func(sort_type_val);
+	set_compare_func(sort_type_val TSRMLS_CC);
 	if (zend_hash_sort(target_hash, qsort, array_data_compare,0) == FAILURE) {
 		return;
 	}
@@ -450,7 +448,7 @@ PHP_FUNCTION(arsort)
 		convert_to_long_ex(sort_type);
 		sort_type_val = Z_LVAL_PP(sort_type);
 	}
-	set_compare_func(sort_type_val);
+	set_compare_func(sort_type_val TSRMLS_CC);
 	if (zend_hash_sort(target_hash, qsort, array_reverse_data_compare,0) == FAILURE) {
 		RETURN_FALSE;
 	}
@@ -479,7 +477,7 @@ PHP_FUNCTION(sort)
 		convert_to_long_ex(sort_type);
 		sort_type_val = Z_LVAL_PP(sort_type);
 	}
-	set_compare_func(sort_type_val);
+	set_compare_func(sort_type_val TSRMLS_CC);
 	if (zend_hash_sort(target_hash, qsort, array_data_compare,1) == FAILURE) {
 		RETURN_FALSE;
 	}
@@ -508,7 +506,7 @@ PHP_FUNCTION(rsort)
 		convert_to_long_ex(sort_type);
 		sort_type_val = Z_LVAL_PP(sort_type);
 	}
-	set_compare_func(sort_type_val);
+	set_compare_func(sort_type_val TSRMLS_CC);
 	if (zend_hash_sort(target_hash, qsort, array_reverse_data_compare,1) == FAILURE) {
 		RETURN_FALSE;
 	}
@@ -851,7 +849,7 @@ PHP_FUNCTION(min)
 		php_error(E_WARNING, "min: must be passed at least 1 value");
 		RETURN_NULL();
 	}
-	set_compare_func(SORT_REGULAR);
+	set_compare_func(SORT_REGULAR TSRMLS_CC);
 	if (argc == 1) {
 		pval **arr;
 
@@ -903,7 +901,7 @@ PHP_FUNCTION(max)
 		php_error(E_WARNING, "max: must be passed at least 1 value");
 		RETURN_NULL();
 	}
-	set_compare_func(SORT_REGULAR);
+	set_compare_func(SORT_REGULAR TSRMLS_CC);
 	if (argc == 1) {
 		pval **arr;
 
@@ -944,7 +942,7 @@ PHP_FUNCTION(max)
 }
 /* }}} */
 
-static int php_array_walk(HashTable *target_hash, zval **userdata)
+static int php_array_walk(HashTable *target_hash, zval **userdata TSRMLS_DC)
 {
 	zval **args[3],			/* Arguments to userland function */
 		  *retval_ptr,			/* Return value - unused */
@@ -953,7 +951,6 @@ static int php_array_walk(HashTable *target_hash, zval **userdata)
 	ulong  string_key_len;
 	ulong  num_key;
 	HashPosition pos;
-	TSRMLS_FETCH();
 
 	/* Allocate space for key */
 	MAKE_STD_ZVAL(key);
@@ -1023,7 +1020,7 @@ PHP_FUNCTION(array_walk)
 		BG(array_walk_func_name) = old_walk_func_name;
 		RETURN_FALSE;
 	}
-	php_array_walk(target_hash, userdata);
+	php_array_walk(target_hash, userdata TSRMLS_CC);
 	BG(array_walk_func_name) = old_walk_func_name;
 	RETURN_TRUE;
 }
@@ -2276,7 +2273,7 @@ PHP_FUNCTION(array_unique)
 	for (i = 0, p = target_hash->pListHead; p; i++, p = p->pListNext)
 		arTmp[i] = p;
 	arTmp[i] = NULL;
-    set_compare_func(SORT_STRING);
+    set_compare_func(SORT_STRING TSRMLS_CC);
 	qsort((void *) arTmp, i, sizeof(Bucket *), array_data_compare);
 
 	/* go through the sorted array and delete duplicates from the copy */
@@ -2319,7 +2316,7 @@ PHP_FUNCTION(array_intersect)
 	/* for each argument, create and sort list with pointers to the hash buckets */
 	lists = (Bucket ***)emalloc(argc * sizeof(Bucket **));
 	ptrs = (Bucket ***)emalloc(argc * sizeof(Bucket **));
-    set_compare_func(SORT_STRING);
+    set_compare_func(SORT_STRING TSRMLS_CC);
 	for (i=0; i<argc; i++) {
 		if (Z_TYPE_PP(args[i]) != IS_ARRAY) {
 			php_error(E_WARNING, "Argument #%d to array_intersect() is not an array", i+1);
@@ -2424,7 +2421,7 @@ PHP_FUNCTION(array_diff)
 	/* for each argument, create and sort list with pointers to the hash buckets */
 	lists = (Bucket ***)emalloc(argc * sizeof(Bucket **));
 	ptrs = (Bucket ***)emalloc(argc * sizeof(Bucket **));
-    set_compare_func(SORT_STRING);
+    set_compare_func(SORT_STRING TSRMLS_CC);
 	for (i=0; i<argc; i++) {
 		if (Z_TYPE_PP(args[i]) != IS_ARRAY) {
 			php_error(E_WARNING, "Argument #%d to array_diff() is not an array", i+1);
@@ -2511,7 +2508,7 @@ int multisort_compare(const void *a, const void *b)
 	
 	r = 0;
 	do {
-		set_compare_func(ARRAYG(multisort_flags)[MULTISORT_TYPE][r]);
+		set_compare_func(ARRAYG(multisort_flags)[MULTISORT_TYPE][r] TSRMLS_CC);
 
 		ARRAYG(compare_func)(&temp, *((zval **)ab[r]->pData), *((zval **)bb[r]->pData) TSRMLS_CC);
 		result = ARRAYG(multisort_flags)[MULTISORT_ORDER][r] * Z_LVAL(temp);
diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c
index 4e121d3e2b..5339d99319 100644
--- a/ext/standard/crypt.c
+++ b/ext/standard/crypt.c
@@ -106,7 +106,7 @@ PHP_MINIT_FUNCTION(crypt)
 PHP_RINIT_FUNCTION(crypt)
 {
 	if(!php_crypt_rand_seeded) {
-		php_srand(time(0) * getpid() * (php_combined_lcg() * 10000.0));
+		php_srand(time(0) * getpid() * (php_combined_lcg(TSRMLS_C) * 10000.0));
 		php_crypt_rand_seeded=1;
 	} 
 	return SUCCESS;
diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index c094b62ee4..93c127caaa 100644
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -201,7 +201,7 @@ int php_Exec(int type, char *cmd, pval *array, pval *return_value TSRMLS_DC)
 		if (PG(magic_quotes_runtime)) {
 			int len;
 
-			tmp = php_addslashes(buf, 0, &len, 0);
+			tmp = php_addslashes(buf, 0, &len, 0 TSRMLS_CC);
 			RETVAL_STRINGL(tmp,len,0);
 		} else {
 			RETVAL_STRINGL(buf,l,1);
diff --git a/ext/standard/file.c b/ext/standard/file.c
index d6b0484324..0a390cf8e9 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -370,7 +370,7 @@ PHP_FUNCTION(get_meta_tags)
 				} else if (saw_content) {
 					/* Get the CONTENT attr (Single word attr, non-quoted) */
 					if (PG(magic_quotes_runtime)) {
-						value = php_addslashes(md.token_data,0,&md.token_len,0);
+						value = php_addslashes(md.token_data,0,&md.token_len,0 TSRMLS_CC);
 					} else {
 						value = estrndup(md.token_data,md.token_len);
 					}
@@ -408,7 +408,7 @@ PHP_FUNCTION(get_meta_tags)
 			} else if (saw_content) {
 				/* Get the CONTENT attr (Single word attr, non-quoted) */
 				if (PG(magic_quotes_runtime)) {
-					value = php_addslashes(md.token_data,0,&md.token_len,0);
+					value = php_addslashes(md.token_data,0,&md.token_len,0 TSRMLS_CC);
 				} else {
 					value = estrndup(md.token_data,md.token_len);
 				}
@@ -541,7 +541,7 @@ PHP_FUNCTION(file)
 			}
 		}
 		if (PG(magic_quotes_runtime)) {
-			slashed = php_addslashes(target_buf, target_len, &len, 1); /* 1 = free source string */
+			slashed = php_addslashes(target_buf, target_len, &len, 1 TSRMLS_CC); /* 1 = free source string */
             add_index_stringl(return_value, i++, slashed, len, 0);
 		} else {
 			target_buf = erealloc(target_buf, target_len+1); /* do we really want to do that? */
@@ -1038,7 +1038,7 @@ PHP_FUNCTION(fgets)
 	}
 
 	if (PG(magic_quotes_runtime)) {
-		return_value->value.str.val = php_addslashes(buf,0,&return_value->value.str.len,1);
+		return_value->value.str.val = php_addslashes(buf,0,&return_value->value.str.len,1 TSRMLS_CC);
 	} else {
 		return_value->value.str.val = buf;
 		return_value->value.str.len = strlen(return_value->value.str.val);
@@ -1308,7 +1308,7 @@ PHP_FUNCTION(fwrite)
 
 	if (!arg3 && PG(magic_quotes_runtime)) {
 		zval_copy_ctor(*arg2);
-		php_stripslashes((*arg2)->value.str.val,&num_bytes);
+		php_stripslashes(Z_STRVAL_PP(arg2), &num_bytes TSRMLS_CC);
 	}
 
 #if HAVE_PHP_STREAM
@@ -1570,8 +1570,6 @@ static size_t php_passthru_fd(int socketd, FILE *fp, int issock TSRMLS_DC)
 			len = sbuf.st_size - off;
 			p = mmap(0, len, PROT_READ, MAP_SHARED, fd, off);
 			if (p != (void *) MAP_FAILED) {
-				TSRMLS_FETCH();
-
 				BG(mmap_file) = p;
 				BG(mmap_len) = len;
 				PHPWRITE(p, len);
@@ -2036,7 +2034,7 @@ PHP_FUNCTION(fread)
 	}
 	return_value->value.str.val[return_value->value.str.len] = 0;
 	if (PG(magic_quotes_runtime)) {
-		return_value->value.str.val = php_addslashes(return_value->value.str.val,return_value->value.str.len,&return_value->value.str.len,1);
+		return_value->value.str.val = php_addslashes(return_value->value.str.val,return_value->value.str.len,&return_value->value.str.len,1 TSRMLS_CC);
 	}
 	return_value->type = IS_STRING;
 }
diff --git a/ext/standard/lcg.c b/ext/standard/lcg.c
index f0ba907d45..88aa7ffc9d 100644
--- a/ext/standard/lcg.c
+++ b/ext/standard/lcg.c
@@ -46,11 +46,10 @@ static int php_lcg_initialized = 0;
 
 #define MODMULT(a,b,c,m,s) q = s/a;s=b*(s-a*q)-c*q;if(s<0)s+=m
 
-double php_combined_lcg(void)
+double php_combined_lcg(TSRMLS_D)
 {
 	php_int32 q;
 	php_int32 z;
-	TSRMLS_FETCH();
 
 	MODMULT(53668,40014,12211,2147483563L, LCG(s1));
 	MODMULT(52774,40692,3791, 2147483399L, LCG(s2));
@@ -94,7 +93,7 @@ PHP_RINIT_FUNCTION(lcg)
    Returns a value from the combined linear congruential generator */
 PHP_FUNCTION(lcg_value)
 {
-	RETURN_DOUBLE(php_combined_lcg());
+	RETURN_DOUBLE(php_combined_lcg(TSRMLS_C));
 }
 /* }}} */
 
diff --git a/ext/standard/php_lcg.h b/ext/standard/php_lcg.h
index e33600fe12..05bcc83c44 100644
--- a/ext/standard/php_lcg.h
+++ b/ext/standard/php_lcg.h
@@ -28,7 +28,7 @@ typedef struct {
 	php_int32 s2;
 } php_lcg_globals;
 
-double php_combined_lcg(void);
+double php_combined_lcg(TSRMLS_D);
 PHP_FUNCTION(lcg_value);
 
 #ifdef ZTS
diff --git a/ext/standard/php_string.h b/ext/standard/php_string.h
index 4b98d910d9..40d0ce1312 100644
--- a/ext/standard/php_string.h
+++ b/ext/standard/php_string.h
@@ -102,17 +102,17 @@ PHPAPI int strnatcmp_ex(char const *a, size_t a_len, char const *b, size_t b_len
 PHPAPI char *php_strtoupper(char *s, size_t len);
 PHPAPI char *php_strtolower(char *s, size_t len);
 PHPAPI char *php_strtr(char *str, int len, char *str_from, char *str_to, int trlen);
-PHPAPI char *php_addslashes(char *str, int length, int *new_length, int freeit);
-PHPAPI char *php_addcslashes(char *str, int length, int *new_length, int freeit, char *what, int wlength);
-PHPAPI void php_stripslashes(char *str, int *len);
+PHPAPI char *php_addslashes(char *str, int length, int *new_length, int freeit TSRMLS_DC);
+PHPAPI char *php_addcslashes(char *str, int length, int *new_length, int freeit, char *what, int wlength TSRMLS_DC);
+PHPAPI void php_stripslashes(char *str, int *len TSRMLS_DC);
 PHPAPI void php_stripcslashes(char *str, int *len);
 PHPAPI char *php_basename(char *str, size_t  len ,char *suffix, size_t sufflen);
 PHPAPI void php_dirname(char *str, int len);
 PHPAPI char *php_stristr(unsigned char *s, unsigned char *t, size_t s_len, size_t t_len);
 PHPAPI char *php_str_to_str(char *haystack, int length, char *needle,
 		int needle_len, char *str, int str_len, int *_new_length);
-PHPAPI void php_trim(pval *str, pval *return_value, int mode);
-PHPAPI void php_trim2(zval *str, zval *what, zval *return_value, int mode);
+PHPAPI void php_trim(pval *str, pval *return_value, int mode TSRMLS_DC);
+PHPAPI void php_trim2(zval *str, zval *what, zval *return_value, int mode TSRMLS_DC);
 PHPAPI void php_strip_tags(char *rbuf, int len, int state, char *allow, int allow_len);
 
 PHPAPI void php_char_to_str(char *str, uint len, char from, char *to, int to_len, pval *result);
diff --git a/ext/standard/string.c b/ext/standard/string.c
index 7cba634ce5..1b7bc6424d 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -454,15 +454,15 @@ int php_charmask(unsigned char *input, int len, char *mask TSRMLS_DC)
 /* {{{ php_trim
        Compatibility function, ports old-API to new one. (DEPRECATED)
 */
-void php_trim(zval *str, zval *return_value, int mode)
+void php_trim(zval *str, zval *return_value, int mode TSRMLS_DC)
 {
-	php_trim2(str, NULL, return_value, mode);
+	php_trim2(str, NULL, return_value, mode TSRMLS_CC);
 }
 /* }}} */
 
 /* {{{ php_trim2
  */
-PHPAPI void php_trim2(zval *str, zval *what, zval *return_value, int mode)
+PHPAPI void php_trim2(zval *str, zval *what, zval *return_value, int mode TSRMLS_DC)
 /* mode 1 : trim left
    mode 2 : trim right
    mode 3 : trim left and right
@@ -470,8 +470,6 @@ PHPAPI void php_trim2(zval *str, zval *what, zval *return_value, int mode)
    what indicates which chars are to be trimmed. NULL->default (' \t\n\r\v\0')
 */
 {
-	TSRMLS_FETCH();
-
 	register int i;
 	int len = str->value.str.len;
 	int trimmed = 0;
@@ -528,7 +526,7 @@ PHP_FUNCTION(chop)
 	/* convert_to_string_ex never fails (last line: op->type = IS_STRING),
 	   so, not checking for that. */
 
-	php_trim2(*str, ZEND_NUM_ARGS()==2?*what:NULL, return_value, 2);
+	php_trim2(*str, ZEND_NUM_ARGS()==2?*what:NULL, return_value, 2 TSRMLS_CC);
 }
 /* }}} */
 
@@ -545,7 +543,7 @@ PHP_FUNCTION(trim)
 	if (ZEND_NUM_ARGS() == 2)
 		convert_to_string_ex(str);
 
-	php_trim2(*str, ZEND_NUM_ARGS()==2?*what:NULL, return_value, 3);
+	php_trim2(*str, ZEND_NUM_ARGS()==2?*what:NULL, return_value, 3 TSRMLS_CC);
 }
 /* }}} */
 
@@ -562,7 +560,7 @@ PHP_FUNCTION(ltrim)
 	if (ZEND_NUM_ARGS() == 2)
 		convert_to_string_ex(str);
 
-	php_trim2(*str, ZEND_NUM_ARGS()==2?*what:NULL, return_value, 1);
+	php_trim2(*str, ZEND_NUM_ARGS()==2?*what:NULL, return_value, 1 TSRMLS_CC);
 }
 /* }}} */
 
@@ -2107,12 +2105,11 @@ PHP_FUNCTION(similar_text)
 /* {{{ php_stripslashes
  *
  * be careful, this edits the string in-place */
-PHPAPI void php_stripslashes(char *str, int *len)
+PHPAPI void php_stripslashes(char *str, int *len TSRMLS_DC)
 {
 	char *s, *t;
 	int l;
 	char escape_char='\\';
-	TSRMLS_FETCH();
 
 	if (PG(magic_quotes_sybase)) {
 		escape_char='\'';
@@ -2168,15 +2165,17 @@ PHP_FUNCTION(addcslashes)
 	convert_to_string_ex(str);
 	convert_to_string_ex(what);
 
-	if(Z_STRLEN_PP(str) == 0) {
+	if (Z_STRLEN_PP(str) == 0) {
 		RETURN_EMPTY_STRING();
 	}
 
-	if(Z_STRLEN_PP(what) == 0) {
-		RETURN_STRINGL(Z_STRVAL_PP(str),Z_STRLEN_PP(str),1);
+	if (Z_STRLEN_PP(what) == 0) {
+		RETURN_STRINGL(Z_STRVAL_PP(str), Z_STRLEN_PP(str), 1);
 	}
 
-	return_value->value.str.val = php_addcslashes((*str)->value.str.val,(*str)->value.str.len,&return_value->value.str.len,0,(*what)->value.str.val,(*what)->value.str.len);
+	Z_STRVAL_P(return_value) = php_addcslashes(Z_STRVAL_PP(str), 
+			Z_STRLEN_PP(str), &Z_STRLEN_P(return_value), 0, Z_STRVAL_PP(what),
+			Z_STRLEN_PP(what) TSRMLS_CC);
 	return_value->type = IS_STRING;
 }
 /* }}} */
@@ -2192,12 +2191,13 @@ PHP_FUNCTION(addslashes)
 	}
 	convert_to_string_ex(str);
 
-	if(Z_STRLEN_PP(str) == 0) {
+	if (Z_STRLEN_PP(str) == 0) {
 		RETURN_EMPTY_STRING();
 	}
 
-	return_value->value.str.val = php_addslashes((*str)->value.str.val,(*str)->value.str.len,&return_value->value.str.len,0);
-	return_value->type = IS_STRING;
+	Z_STRVAL_P(return_value) = php_addslashes(Z_STRVAL_PP(str),
+			Z_STRLEN_PP(str), &Z_STRLEN_P(return_value), 0 TSRMLS_CC);
+	Z_TYPE_P(return_value) = IS_STRING;
 }
 /* }}} */
 
@@ -2231,7 +2231,7 @@ PHP_FUNCTION(stripslashes)
 
 	*return_value = **str;
 	zval_copy_ctor(return_value);
-	php_stripslashes(return_value->value.str.val,&return_value->value.str.len);
+	php_stripslashes(Z_STRVAL_P(return_value), &Z_STRLEN_P(return_value) TSRMLS_CC);
 }
 /* }}} */
 
@@ -2314,10 +2314,8 @@ PHPAPI void php_stripcslashes(char *str, int *len)
 			
 /* {{{ php_addcslashes
  */
-PHPAPI char *php_addcslashes(char *str, int length, int *new_length, int should_free, char *what, int wlength)
+PHPAPI char *php_addcslashes(char *str, int length, int *new_length, int should_free, char *what, int wlength TSRMLS_DC)
 {
-	/* TSRMLS_FETCH(); (causes parse error -> ?) */
-
 	char flags[256];
 	char *new_str = emalloc((length?length:(length=strlen(str)))*4+1); 
 	char *source,*target;
@@ -2372,14 +2370,13 @@ PHPAPI char *php_addcslashes(char *str, int length, int *new_length, int should_
 
 /* {{{ php_addslashes
  */
-PHPAPI char *php_addslashes(char *str, int length, int *new_length, int should_free)
+PHPAPI char *php_addslashes(char *str, int length, int *new_length, int should_free TSRMLS_DC)
 {
 	/* maximum string length, worst case situation */
 	char *new_str;
 	char *source,*target;
 	char *end;
 	char c;
-	TSRMLS_FETCH();
  	
 	if (!str) {
 		*new_length = 0;
diff --git a/ext/standard/uniqid.c b/ext/standard/uniqid.c
index 1af35de9d7..d1a0f50034 100644
--- a/ext/standard/uniqid.c
+++ b/ext/standard/uniqid.c
@@ -77,7 +77,7 @@ PHP_FUNCTION(uniqid)
 	 * digits for usecs.
 	 */
 	if (MORE_ENTROPY) {
-		sprintf(uniqid, "%s%08x%05x%.8f", (*prefix)->value.str.val, sec, usec, php_combined_lcg() * 10);
+		sprintf(uniqid, "%s%08x%05x%.8f", (*prefix)->value.str.val, sec, usec, php_combined_lcg(TSRMLS_C) * 10);
 	} else {
 		sprintf(uniqid, "%s%08x%05x", (*prefix)->value.str.val, sec, usec);
 	}
diff --git a/ext/sybase/php_sybase_db.c b/ext/sybase/php_sybase_db.c
index e86f5bd012..8823ea0810 100644
--- a/ext/sybase/php_sybase_db.c
+++ b/ext/sybase/php_sybase_db.c
@@ -785,7 +785,7 @@ PHP_FUNCTION(sybase_query)
 
 				convert_to_string(cur_value);
 				if (PG(magic_quotes_runtime)) {
-					cur_value->value.str.val = php_addslashes(cur_value->value.str.val, cur_value->value.str.len, &cur_value->value.str.len,0);
+					cur_value->value.str.val = php_addslashes(cur_value->value.str.val, cur_value->value.str.len, &cur_value->value.str.len,0 TSRMLS_CC);
 				}
 			}
 		}
diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c
index ee98b16d1d..8483f20116 100644
--- a/ext/sybase_ct/php_sybase_ct.c
+++ b/ext/sybase_ct/php_sybase_ct.c
@@ -1366,7 +1366,7 @@ static void php_sybase_fetch_hash(INTERNAL_FUNCTION_PARAMETERS)
 		*tmp = result->data[result->cur_row][i];
 		INIT_PZVAL(tmp);
 		if (PG(magic_quotes_runtime) && tmp->type == IS_STRING) {
-			tmp->value.str.val = php_addslashes(tmp->value.str.val, tmp->value.str.len, &tmp->value.str.len, 0);
+			tmp->value.str.val = php_addslashes(tmp->value.str.val, tmp->value.str.len, &tmp->value.str.len, 0 TSRMLS_CC);
 		} else {
 			pval_copy_constructor(tmp);
 		}
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 3b5c7ed0ba..72a4680fe8 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -289,7 +289,7 @@ PHP_FUNCTION(gzfile)
 		if (PG(magic_quotes_runtime)) {
 			int len;
 			
-			slashed = php_addslashes(buf,0,&len,0); /* 0 = don't free source string */
+			slashed = php_addslashes(buf,0,&len,0 TSRMLS_CC); /* 0 = don't free source string */
             add_index_stringl(return_value, i++, slashed, len, 0);
 		} else {
 			add_index_string(return_value, i++, buf, 1);
@@ -406,7 +406,7 @@ PHP_FUNCTION(gzgets)
 		RETVAL_FALSE;
 	} else {
 		if (PG(magic_quotes_runtime)) {
-			return_value->value.str.val = php_addslashes(buf,0,&return_value->value.str.len,1);
+			return_value->value.str.val = php_addslashes(buf,0,&return_value->value.str.len,1 TSRMLS_CC);
 		} else {
 			return_value->value.str.val = buf;
 			return_value->value.str.len = strlen(return_value->value.str.val);
@@ -534,7 +534,7 @@ PHP_FUNCTION(gzwrite)
 
 	/* strip slashes only if the length wasn't specified explicitly */
 	if (!arg3 && PG(magic_quotes_runtime)) {
-		php_stripslashes((*arg2)->value.str.val,&num_bytes);
+		php_stripslashes(Z_STRVAL_PP(arg2), &num_bytes TSRMLS_CC);
 	}
 
 	ret = gzwrite(zp, (*arg2)->value.str.val,num_bytes);
@@ -707,7 +707,7 @@ PHP_FUNCTION(gzread)
 	return_value->value.str.val[return_value->value.str.len] = 0;
 
 	if (PG(magic_quotes_runtime)) {
-		return_value->value.str.val = php_addslashes(return_value->value.str.val,return_value->value.str.len,&return_value->value.str.len,1);
+		return_value->value.str.val = php_addslashes(return_value->value.str.val,return_value->value.str.len,&return_value->value.str.len,1 TSRMLS_CC);
 	}
 	return_value->type = IS_STRING;
 }