some more eliminate-fetches-or-escalate-them-at-least

9 files changed, 16 insertions, 11 deletions

diff --git a/ext/cpdf/cpdf.c b/ext/cpdf/cpdf.c
index bb1ce59fca..3543f72c0f 100644
--- a/ext/cpdf/cpdf.c
+++ b/ext/cpdf/cpdf.c
@@ -2335,7 +2335,7 @@ PHP_FUNCTION(cpdf_output_buffer)
 
 	buffer = cpdf_getBufferForPDF(pdf, &lenght);
 
-	php_write(buffer, lenght);
+	php_write(buffer, lenght TSRMLS_CC);
 
 	RETURN_TRUE;
 }
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index eafac5858d..c60dafbd61 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -1382,7 +1382,7 @@ static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, char
 		ap_bsetflag(php3_rqst->connection->client, B_EBCDIC2ASCII, 0);
 #endif
 		while ((b = fread(buf, 1, sizeof(buf), tmp)) > 0) {
-			php_write(buf, b);
+			php_write(buf, b TSRMLS_CC);
 		}
 
         fclose(tmp);
diff --git a/ext/gd/gd_ctx.c b/ext/gd/gd_ctx.c
index 3c389a38ba..3c599cab65 100644
--- a/ext/gd/gd_ctx.c
+++ b/ext/gd/gd_ctx.c
@@ -5,12 +5,14 @@
 	
 static void _php_image_output_putc(struct gdIOCtx *ctx, int c)
 {
-	php_write(&c, 1);
+	TSRMLS_FETCH();
+	php_write(&c, 1 TSRMLS_CC);
 }
 
 static int _php_image_output_putbuf(struct gdIOCtx *ctx, const void* buf, int l)
 {
-	return php_write((void *)buf, l);
+	TSRMLS_FETCH();
+	return php_write((void *)buf, l TSRMLS_CC);
 }
 
 static void _php_image_output_ctxfree(struct gdIOCtx *ctx)
diff --git a/ext/ming/ming.c b/ext/ming/ming.c
index 60a3ff8050..46aec90a0f 100644
--- a/ext/ming/ming.c
+++ b/ext/ming/ming.c
@@ -1489,7 +1489,9 @@ PHP_FUNCTION(swfmovie_remove)
 
 void phpByteOutputMethod(byte b, void *data)
 {
-  php_write(&b, 1);
+  TSRMLS_FETCH();
+
+  php_write(&b, 1 TSRMLS_CC);
 }
 
 PHP_FUNCTION(swfmovie_output)
diff --git a/ext/pdf/pdf.c b/ext/pdf/pdf.c
index 7274b0e15a..dfb17b328c 100644
--- a/ext/pdf/pdf.c
+++ b/ext/pdf/pdf.c
@@ -325,8 +325,9 @@ static void pdf_efree(PDF *p, void *mem)
  */
 static size_t pdf_flushwrite(PDF *p, void *data, size_t size)
 {
-	return(php_write(data, size));
-	return 0;
+	TSRMLS_FETCH();
+
+	return(php_write(data, size TSRMLS_CC));
 }
 /* }}} */
 
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 1061ef8583..81fef71dcf 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -174,7 +174,7 @@ _notice_handler(void *arg, const char *message)
 	TSRMLS_FETCH();
 
 	if (! PGG(ignore_notices)) {
-		php_log_err((char *) message);
+		php_log_err((char *) message TSRMLS_CC);
 		if (PGG(last_notice) != NULL) {
 			efree(PGG(last_notice));
 		}
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 6370c5e4b2..cc19b0dfaa 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -1614,7 +1614,7 @@ PHPAPI int _php_error_log(int opt_err, char *message, char *opt, char *headers T
 			fclose(logfile);
 			break;
 		default:
-			php_log_err(message);
+			php_log_err(message TSRMLS_CC);
 			break;
 	}
 	return SUCCESS;
diff --git a/ext/swf/swf.c b/ext/swf/swf.c
index b06eba7fd6..3b0ca328b7 100644
--- a/ext/swf/swf.c
+++ b/ext/swf/swf.c
@@ -255,7 +255,7 @@ PHP_FUNCTION(swf_closefile)
 		}
 		
 		while ((b = fread(buf, 1, sizeof(buf), f)) > 0)
-			php_write(buf, b);
+			php_write(buf, b TSRMLS_CC);
 		
 		fclose(f);
 		
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index a0137878d5..3b5c7ed0ba 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -67,7 +67,7 @@
 #define PUTC(a) PUTS(a)
 #endif
 #ifndef PHPWRITE
-#define PHPWRITE(a,n) php_write((a),(n))
+#define PHPWRITE(a,n) php_write((a),(n) TSRMLS_CC)
 #endif
 #endif