first shot remove TSRMLS_* things

1 files changed, 25 insertions, 25 deletions

diff --git a/Zend/zend_stream.c b/Zend/zend_stream.c
index f67f59af4a..63d9879412 100644
--- a/Zend/zend_stream.c
+++ b/Zend/zend_stream.c
@@ -49,19 +49,19 @@
 
 ZEND_DLIMPORT int isatty(int fd);
 
-static size_t zend_stream_stdio_reader(void *handle, char *buf, size_t len TSRMLS_DC) /* {{{ */
+static size_t zend_stream_stdio_reader(void *handle, char *buf, size_t len) /* {{{ */
 {
 	return fread(buf, 1, len, (FILE*)handle);
 } /* }}} */
 
-static void zend_stream_stdio_closer(void *handle TSRMLS_DC) /* {{{ */
+static void zend_stream_stdio_closer(void *handle) /* {{{ */
 {
 	if (handle && (FILE*)handle != stdin) {
 		fclose((FILE*)handle);
 	}
 } /* }}} */
 
-static size_t zend_stream_stdio_fsizer(void *handle TSRMLS_DC) /* {{{ */
+static size_t zend_stream_stdio_fsizer(void *handle) /* {{{ */
 {
 	zend_stat_t buf;
 	if (handle && zend_fstat(fileno((FILE*)handle), &buf) == 0) {
@@ -75,7 +75,7 @@ static size_t zend_stream_stdio_fsizer(void *handle TSRMLS_DC) /* {{{ */
 	return 0;
 } /* }}} */
 
-static void zend_stream_unmap(zend_stream *stream TSRMLS_DC) { /* {{{ */
+static void zend_stream_unmap(zend_stream *stream) { /* {{{ */
 #if HAVE_MMAP
 	if (stream->mmap.map) {
 		munmap(stream->mmap.map, stream->mmap.len + ZEND_MMAP_AHEAD);
@@ -91,11 +91,11 @@ static void zend_stream_unmap(zend_stream *stream TSRMLS_DC) { /* {{{ */
 	stream->handle   = stream->mmap.old_handle;
 } /* }}} */
 
-static void zend_stream_mmap_closer(zend_stream *stream TSRMLS_DC) /* {{{ */
+static void zend_stream_mmap_closer(zend_stream *stream) /* {{{ */
 {
-	zend_stream_unmap(stream TSRMLS_CC);
+	zend_stream_unmap(stream);
 	if (stream->mmap.old_closer && stream->handle) {
-		stream->mmap.old_closer(stream->handle TSRMLS_CC);
+		stream->mmap.old_closer(stream->handle);
 	}
 } /* }}} */
 
@@ -103,7 +103,7 @@ static inline int zend_stream_is_mmap(zend_file_handle *file_handle) { /* {{{ */
 	return file_handle->type == ZEND_HANDLE_MAPPED;
 } /* }}} */
 
-static size_t zend_stream_fsize(zend_file_handle *file_handle TSRMLS_DC) /* {{{ */
+static size_t zend_stream_fsize(zend_file_handle *file_handle) /* {{{ */
 {
 	zend_stat_t buf;
 
@@ -111,7 +111,7 @@ static size_t zend_stream_fsize(zend_file_handle *file_handle TSRMLS_DC) /* {{{
 		return file_handle->handle.stream.mmap.len;
 	}
 	if (file_handle->type == ZEND_HANDLE_STREAM || file_handle->type == ZEND_HANDLE_MAPPED) {
-		return file_handle->handle.stream.fsizer(file_handle->handle.stream.handle TSRMLS_CC);
+		return file_handle->handle.stream.fsizer(file_handle->handle.stream.handle);
 	}
 	if (file_handle->handle.fp && zend_fstat(fileno(file_handle->handle.fp), &buf) == 0) {
 #ifdef S_ISREG
@@ -125,14 +125,14 @@ static size_t zend_stream_fsize(zend_file_handle *file_handle TSRMLS_DC) /* {{{
 	return -1;
 } /* }}} */
 
-ZEND_API int zend_stream_open(const char *filename, zend_file_handle *handle TSRMLS_DC) /* {{{ */
+ZEND_API int zend_stream_open(const char *filename, zend_file_handle *handle) /* {{{ */
 {
 	if (zend_stream_open_function) {
-		return zend_stream_open_function(filename, handle TSRMLS_CC);
+		return zend_stream_open_function(filename, handle);
 	}
 	handle->type = ZEND_HANDLE_FP;
 	handle->opened_path = NULL;
-	handle->handle.fp = zend_fopen(filename, &handle->opened_path TSRMLS_CC);
+	handle->handle.fp = zend_fopen(filename, &handle->opened_path);
 	handle->filename = filename;
 	handle->free_filename = 0;
 	memset(&handle->handle.stream.mmap, 0, sizeof(zend_mmap));
@@ -140,17 +140,17 @@ ZEND_API int zend_stream_open(const char *filename, zend_file_handle *handle TSR
 	return (handle->handle.fp) ? SUCCESS : FAILURE;
 } /* }}} */
 
-static int zend_stream_getc(zend_file_handle *file_handle TSRMLS_DC) /* {{{ */
+static int zend_stream_getc(zend_file_handle *file_handle) /* {{{ */
 {
 	char buf;
 
-	if (file_handle->handle.stream.reader(file_handle->handle.stream.handle, &buf, sizeof(buf) TSRMLS_CC)) {
+	if (file_handle->handle.stream.reader(file_handle->handle.stream.handle, &buf, sizeof(buf))) {
 		return (int)buf;
 	}
 	return EOF;
 } /* }}} */
 
-static size_t zend_stream_read(zend_file_handle *file_handle, char *buf, size_t len TSRMLS_DC) /* {{{ */
+static size_t zend_stream_read(zend_file_handle *file_handle, char *buf, size_t len) /* {{{ */
 {
 	if (!zend_stream_is_mmap(file_handle) && file_handle->handle.stream.isatty) {
 		int c = '*';
@@ -162,9 +162,9 @@ static size_t zend_stream_read(zend_file_handle *file_handle, char *buf, size_t
 			Ascii value 4 is actually EOT character which is not defined anywhere in the LibC
 			or else we can use instead of hardcoded 4.
 		*/
-		for (n = 0; n < len && (c = zend_stream_getc(file_handle TSRMLS_CC)) != EOF && c != 4 && c != '\n'; ++n) {
+		for (n = 0; n < len && (c = zend_stream_getc(file_handle)) != EOF && c != 4 && c != '\n'; ++n) {
 #else
-		for (n = 0; n < len && (c = zend_stream_getc(file_handle TSRMLS_CC)) != EOF && c != '\n'; ++n)  {
+		for (n = 0; n < len && (c = zend_stream_getc(file_handle)) != EOF && c != '\n'; ++n)  {
 #endif
 			buf[n] = (char)c;
 		}
@@ -174,16 +174,16 @@ static size_t zend_stream_read(zend_file_handle *file_handle, char *buf, size_t
 
 		return n;
 	}
-	return file_handle->handle.stream.reader(file_handle->handle.stream.handle, buf, len TSRMLS_CC);
+	return file_handle->handle.stream.reader(file_handle->handle.stream.handle, buf, len);
 } /* }}} */
 
-ZEND_API int zend_stream_fixup(zend_file_handle *file_handle, char **buf, size_t *len TSRMLS_DC) /* {{{ */
+ZEND_API int zend_stream_fixup(zend_file_handle *file_handle, char **buf, size_t *len) /* {{{ */
 {
 	size_t size;
 	zend_stream_type old_type;
 
 	if (file_handle->type == ZEND_HANDLE_FILENAME) {
-		if (zend_stream_open(file_handle->filename, file_handle TSRMLS_CC) == FAILURE) {
+		if (zend_stream_open(file_handle->filename, file_handle) == FAILURE) {
 			return FAILURE;
 		}
 	}
@@ -218,7 +218,7 @@ ZEND_API int zend_stream_fixup(zend_file_handle *file_handle, char **buf, size_t
 			return FAILURE;
 	}
 
-	size = zend_stream_fsize(file_handle TSRMLS_CC);
+	size = zend_stream_fsize(file_handle);
 	if (size == (size_t)-1) {
 		return FAILURE;
 	}
@@ -252,13 +252,13 @@ ZEND_API int zend_stream_fixup(zend_file_handle *file_handle, char **buf, size_t
 #endif
 		file_handle->handle.stream.mmap.map = 0;
 		file_handle->handle.stream.mmap.buf = *buf = safe_emalloc(1, size, ZEND_MMAP_AHEAD);
-		file_handle->handle.stream.mmap.len = zend_stream_read(file_handle, *buf, size TSRMLS_CC);
+		file_handle->handle.stream.mmap.len = zend_stream_read(file_handle, *buf, size);
 	} else {
 		size_t read, remain = 4*1024;
 		*buf = emalloc(remain);
 		size = 0;
 
-		while ((read = zend_stream_read(file_handle, *buf + size, remain TSRMLS_CC)) > 0) {
+		while ((read = zend_stream_read(file_handle, *buf + size, remain)) > 0) {
 			size   += read;
 			remain -= read;
 
@@ -299,7 +299,7 @@ return_mapped:
 	return SUCCESS;
 } /* }}} */
 
-ZEND_API void zend_file_handle_dtor(zend_file_handle *fh TSRMLS_DC) /* {{{ */
+ZEND_API void zend_file_handle_dtor(zend_file_handle *fh) /* {{{ */
 {
 	switch (fh->type) {
 		case ZEND_HANDLE_FD:
@@ -311,7 +311,7 @@ ZEND_API void zend_file_handle_dtor(zend_file_handle *fh TSRMLS_DC) /* {{{ */
 		case ZEND_HANDLE_STREAM:
 		case ZEND_HANDLE_MAPPED:
 			if (fh->handle.stream.closer && fh->handle.stream.handle) {
-				fh->handle.stream.closer(fh->handle.stream.handle TSRMLS_CC);
+				fh->handle.stream.closer(fh->handle.stream.handle);
 			}
 			fh->handle.stream.handle = NULL;
 			break;