more tsrm cleanup

5 files changed, 21 insertions, 24 deletions

diff --git a/ext/sablot/sablot.c b/ext/sablot/sablot.c
index f3b3f8520d..6547f9050e 100644
--- a/ext/sablot/sablot.c
+++ b/ext/sablot/sablot.c
@@ -282,7 +282,7 @@ PHP_FUNCTION(xslt_output_begintransform)
      * Start output buffering, NULL signifies that no "user-space" output function
      * will be used.  The 0 disables chunking
      */
-    php_start_ob_buffer(NULL, 0);
+    php_start_ob_buffer(NULL, 0 TSRMLS_CC);
 }
 /* }}} */
 
@@ -345,7 +345,7 @@ PHP_FUNCTION(xslt_output_endtransform)
      * current output buffer (so we don't send data twice) 
      */
     if (tRes)
-        php_end_ob_buffer(0, 0);
+        php_end_ob_buffer(0, 0 TSRMLS_CC);
     
     PUTS(tRes);
     
@@ -360,7 +360,7 @@ PHP_FUNCTION(xslt_output_endtransform)
     if (tRes)
         SablotFree(tRes);
     else
-        php_end_ob_buffer(1, 0);
+        php_end_ob_buffer(1, 0 TSRMLS_CC);
 }
 /* }}} */
 
diff --git a/ext/session/php_session.h b/ext/session/php_session.h
index 70ad99076d..8c3ce17208 100644
--- a/ext/session/php_session.h
+++ b/ext/session/php_session.h
@@ -146,7 +146,7 @@ typedef struct ps_serializer_struct {
 #ifdef TRANS_SID
 void session_adapt_uris(const char *, size_t, char **, size_t * TSRMLS_DC);
 void session_adapt_url(const char *, size_t, char **, size_t * TSRMLS_DC);
-void session_adapt_flush(int (*)(const char *, uint));
+void session_adapt_flush(int (*)(const char *, uint) TSRMLS_DC);
 #else
 #define session_adapt_uris(a,b,c,d) do { } while(0)
 #define session_adapt_url(a,b,c,d) do { } while(0)
diff --git a/ext/session/session.c b/ext/session/session.c
index e41897793a..7e753261b6 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -658,8 +658,8 @@ static int php_session_cache_limiter(TSRMLS_D)
 	php_session_cache_limiter_t *lim;
 
 	if (SG(headers_sent)) {
-		char *output_start_filename = php_get_output_start_filename();
-		int output_start_lineno = php_get_output_start_lineno();
+		char *output_start_filename = php_get_output_start_filename(TSRMLS_C);
+		int output_start_lineno = php_get_output_start_lineno(TSRMLS_C);
 
 		if (output_start_filename) {
 			php_error(E_WARNING, "Cannot send session cache limiter - headers already sent (output started at %s:%d)",
@@ -692,8 +692,8 @@ static void php_session_send_cookie(TSRMLS_D)
 	char *date_fmt = NULL;
 
 	if (SG(headers_sent)) {
-		char *output_start_filename = php_get_output_start_filename();
-		int output_start_lineno = php_get_output_start_lineno();
+		char *output_start_filename = php_get_output_start_filename(TSRMLS_C);
+		int output_start_lineno = php_get_output_start_lineno(TSRMLS_C);
 
 		if (output_start_filename) {
 			php_error(E_WARNING, "Cannot send session cookie - headers already sent by (output started at %s:%d)",
@@ -1280,13 +1280,13 @@ void session_adapt_url(const char *url, size_t urllen, char **new, size_t *newle
 		*new = url_adapt_single_url(url, urllen, PS(session_name), PS(id), newlen);
 }
 
-void session_adapt_flush(int (*write)(const char *, uint))
+void session_adapt_flush(int (*write)(const char *, uint TSRMLS_DC) TSRMLS_DC)
 {
 	char *str;
 	size_t len;
 	
 	str = url_adapt_flush(&len);
-	if (str) write(str, len);
+	if (str) write(str, len TSRMLS_CC);
 }
 
 #endif
diff --git a/ext/zlib/php_zlib.h b/ext/zlib/php_zlib.h
index 22432c4a1b..8fd808024e 100644
--- a/ext/zlib/php_zlib.h
+++ b/ext/zlib/php_zlib.h
@@ -65,7 +65,7 @@ PHP_FUNCTION(gzencode);
 PHP_FUNCTION(ob_gzhandler);
 
 FILE *zlib_fopen_wrapper(const char *path, char *mode, int options, int *issock, int *socketd, char **opened_path TSRMLS_DC);
-int php_enable_output_compression(int buffer_size);
+int php_enable_output_compression(int buffer_size TSRMLS_DC);
 
 
 #ifdef ZTS
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 45dee37364..a0137878d5 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -187,10 +187,10 @@ PHP_RINIT_FUNCTION(zlib)
 		case 0:
 			break;
 		case 1:
-			php_enable_output_compression(4096);
+			php_enable_output_compression(4096 TSRMLS_CC);
 			break;
 		default:
-			php_enable_output_compression(ZLIBG(output_compression));
+			php_enable_output_compression(ZLIBG(output_compression) TSRMLS_CC);
 	}
 	return SUCCESS;
 }
@@ -1025,10 +1025,9 @@ static int php_do_deflate(uint str_length, Bytef **p_buffer, uint *p_buffer_len,
 
 /* {{{ php_deflate_string
  */
-int php_deflate_string(const char *str, uint str_length, char **newstr, uint *new_length, int coding, zend_bool do_start, zend_bool do_end)
+int php_deflate_string(const char *str, uint str_length, char **newstr, uint *new_length, int coding, zend_bool do_start, zend_bool do_end TSRMLS_DC)
 {
 	int err;
-	TSRMLS_FETCH();
 
 	ZLIBG(compression_coding) = coding;
 
@@ -1127,7 +1126,7 @@ PHP_FUNCTION(gzencode)
 			ZEND_WRONG_PARAM_COUNT();
 			break;
 	}
-	if (php_deflate_string(Z_STRVAL_PP(zv_string), Z_STRLEN_PP(zv_string), &Z_STRVAL_P(return_value), &Z_STRLEN_P(return_value), coding, 1, 1)==SUCCESS) {
+	if (php_deflate_string(Z_STRVAL_PP(zv_string), Z_STRLEN_PP(zv_string), &Z_STRVAL_P(return_value), &Z_STRLEN_P(return_value), coding, 1, 1 TSRMLS_CC)==SUCCESS) {
 		Z_TYPE_P(return_value) = IS_STRING;
 	} else {
 		RETURN_FALSE;
@@ -1173,7 +1172,7 @@ PHP_FUNCTION(ob_gzhandler)
 	do_end = ((Z_LVAL_PP(zv_mode) & PHP_OUTPUT_HANDLER_END) ? 1 : 0);
 	Z_STRVAL_P(return_value) = NULL;
 	Z_STRLEN_P(return_value) = 0;
-	if (php_deflate_string(Z_STRVAL_PP(zv_string), Z_STRLEN_PP(zv_string), &Z_STRVAL_P(return_value), &Z_STRLEN_P(return_value), coding, do_start, do_end)==SUCCESS) {
+	if (php_deflate_string(Z_STRVAL_PP(zv_string), Z_STRLEN_PP(zv_string), &Z_STRVAL_P(return_value), &Z_STRLEN_P(return_value), coding, do_start, do_end TSRMLS_CC)==SUCCESS) {
 		Z_TYPE_P(return_value) = IS_STRING;
 		if (do_start) {
 			switch (coding) {
@@ -1223,14 +1222,13 @@ PHP_FUNCTION(ob_gzhandler)
 
 /* {{{ php_gzip_output_handler
  */
-static void php_gzip_output_handler(char *output, uint output_len, char **handled_output, uint *handled_output_len, int mode)
+static void php_gzip_output_handler(char *output, uint output_len, char **handled_output, uint *handled_output_len, int mode TSRMLS_DC)
 {
 	zend_bool do_start, do_end;
-	TSRMLS_FETCH();
 
 	do_start = (mode & PHP_OUTPUT_HANDLER_START ? 1 : 0);
 	do_end = (mode & PHP_OUTPUT_HANDLER_END ? 1 : 0);
-	if (php_deflate_string(output, output_len, handled_output, handled_output_len, ZLIBG(ob_gzip_coding), do_start, do_end)!=SUCCESS) {
+	if (php_deflate_string(output, output_len, handled_output, handled_output_len, ZLIBG(ob_gzip_coding), do_start, do_end TSRMLS_CC)!=SUCCESS) {
 		zend_error(E_ERROR, "Compression failed");
 	}
 }
@@ -1238,10 +1236,9 @@ static void php_gzip_output_handler(char *output, uint output_len, char **handle
 
 /* {{{ php_enable_output_compression
  */
-int php_enable_output_compression(int buffer_size)
+int php_enable_output_compression(int buffer_size TSRMLS_DC)
 {
 	zval **a_encoding, **data;
-	TSRMLS_FETCH();
 
 	if (zend_hash_find(&EG(symbol_table), "HTTP_SERVER_VARS", sizeof("HTTP_SERVER_VARS"), (void **) &data)==FAILURE
 		|| Z_TYPE_PP(data)!=IS_ARRAY
@@ -1263,8 +1260,8 @@ int php_enable_output_compression(int buffer_size)
 		return FAILURE;
 	}
 	
-	php_start_ob_buffer(NULL, buffer_size);
-	php_ob_set_internal_handler(php_gzip_output_handler, buffer_size*1.5);
+	php_start_ob_buffer(NULL, buffer_size TSRMLS_CC);
+	php_ob_set_internal_handler(php_gzip_output_handler, buffer_size*1.5 TSRMLS_CC);
 	return SUCCESS;
 }
 /* }}} */