first shot remove TSRMLS_* things

1 files changed, 121 insertions, 121 deletions

diff --git a/ext/phar/util.c b/ext/phar/util.c
index f131aa99a2..56d168b072 100644
--- a/ext/phar/util.c
+++ b/ext/phar/util.c
@@ -38,11 +38,11 @@
 #include <openssl/ssl.h>
 #include <openssl/pkcs12.h>
 #else
-static int phar_call_openssl_signverify(int is_sign, php_stream *fp, zend_off_t end, char *key, int key_len, char **signature, int *signature_len TSRMLS_DC);
+static int phar_call_openssl_signverify(int is_sign, php_stream *fp, zend_off_t end, char *key, int key_len, char **signature, int *signature_len);
 #endif
 
 /* for links to relative location, prepend cwd of the entry */
-static char *phar_get_link_location(phar_entry_info *entry TSRMLS_DC) /* {{{ */
+static char *phar_get_link_location(phar_entry_info *entry) /* {{{ */
 {
 	char *p, *ret = NULL;
 	if (!entry->link) {
@@ -61,7 +61,7 @@ static char *phar_get_link_location(phar_entry_info *entry TSRMLS_DC) /* {{{ */
 }
 /* }}} */
 
-phar_entry_info *phar_get_link_source(phar_entry_info *entry TSRMLS_DC) /* {{{ */
+phar_entry_info *phar_get_link_source(phar_entry_info *entry) /* {{{ */
 {
 	phar_entry_info *link_entry;
 	char *link;
@@ -70,13 +70,13 @@ phar_entry_info *phar_get_link_source(phar_entry_info *entry TSRMLS_DC) /* {{{ *
 		return entry;
 	}
 
-	link = phar_get_link_location(entry TSRMLS_CC);
+	link = phar_get_link_location(entry);
 	if (NULL != (link_entry = zend_hash_str_find_ptr(&(entry->phar->manifest), entry->link, strlen(entry->link))) ||
 		NULL != (link_entry = zend_hash_str_find_ptr(&(entry->phar->manifest), link, strlen(link)))) {
 		if (link != entry->link) {
 			efree(link);
 		}
-		return phar_get_link_source(link_entry TSRMLS_CC);
+		return phar_get_link_source(link_entry);
 	} else {
 		if (link != entry->link) {
 			efree(link);
@@ -87,24 +87,24 @@ phar_entry_info *phar_get_link_source(phar_entry_info *entry TSRMLS_DC) /* {{{ *
 /* }}} */
 
 /* retrieve a phar_entry_info's current file pointer for reading contents */
-php_stream *phar_get_efp(phar_entry_info *entry, int follow_links TSRMLS_DC) /* {{{ */
+php_stream *phar_get_efp(phar_entry_info *entry, int follow_links) /* {{{ */
 {
 	if (follow_links && entry->link) {
-		phar_entry_info *link_entry = phar_get_link_source(entry TSRMLS_CC);
+		phar_entry_info *link_entry = phar_get_link_source(entry);
 
 		if (link_entry && link_entry != entry) {
-			return phar_get_efp(link_entry, 1 TSRMLS_CC);
+			return phar_get_efp(link_entry, 1);
 		}
 	}
 
-	if (phar_get_fp_type(entry TSRMLS_CC) == PHAR_FP) {
-		if (!phar_get_entrypfp(entry TSRMLS_CC)) {
+	if (phar_get_fp_type(entry) == PHAR_FP) {
+		if (!phar_get_entrypfp(entry)) {
 			/* re-open just in time for cases where our refcount reached 0 on the phar archive */
-			phar_open_archive_fp(entry->phar TSRMLS_CC);
+			phar_open_archive_fp(entry->phar);
 		}
-		return phar_get_entrypfp(entry TSRMLS_CC);
-	} else if (phar_get_fp_type(entry TSRMLS_CC) == PHAR_UFP) {
-		return phar_get_entrypufp(entry TSRMLS_CC);
+		return phar_get_entrypfp(entry);
+	} else if (phar_get_fp_type(entry) == PHAR_UFP) {
+		return phar_get_entrypufp(entry);
 	} else if (entry->fp_type == PHAR_MOD) {
 		return entry->fp;
 	} else {
@@ -117,9 +117,9 @@ php_stream *phar_get_efp(phar_entry_info *entry, int follow_links TSRMLS_DC) /*
 }
 /* }}} */
 
-int phar_seek_efp(phar_entry_info *entry, zend_off_t offset, int whence, zend_off_t position, int follow_links TSRMLS_DC) /* {{{ */
+int phar_seek_efp(phar_entry_info *entry, zend_off_t offset, int whence, zend_off_t position, int follow_links) /* {{{ */
 {
-	php_stream *fp = phar_get_efp(entry, follow_links TSRMLS_CC);
+	php_stream *fp = phar_get_efp(entry, follow_links);
 	zend_off_t temp, eoffset;
 
 	if (!fp) {
@@ -128,7 +128,7 @@ int phar_seek_efp(phar_entry_info *entry, zend_off_t offset, int whence, zend_of
 
 	if (follow_links) {
 		phar_entry_info *t;
-		t = phar_get_link_source(entry TSRMLS_CC);
+		t = phar_get_link_source(entry);
 		if (t) {
 			entry = t;
 		}
@@ -138,7 +138,7 @@ int phar_seek_efp(phar_entry_info *entry, zend_off_t offset, int whence, zend_of
 		return 0;
 	}
 
-	eoffset = phar_get_fp_offset(entry TSRMLS_CC);
+	eoffset = phar_get_fp_offset(entry);
 
 	switch (whence) {
 		case SEEK_END:
@@ -167,7 +167,7 @@ int phar_seek_efp(phar_entry_info *entry, zend_off_t offset, int whence, zend_of
 /* }}} */
 
 /* mount an absolute path or uri to a path internal to the phar archive */
-int phar_mount_entry(phar_archive_data *phar, char *filename, int filename_len, char *path, int path_len TSRMLS_DC) /* {{{ */
+int phar_mount_entry(phar_archive_data *phar, char *filename, int filename_len, char *path, int path_len) /* {{{ */
 {
 	phar_entry_info entry = {0};
 	php_stream_statbuf ssb;
@@ -194,7 +194,7 @@ int phar_mount_entry(phar_archive_data *phar, char *filename, int filename_len,
 	if (is_phar) {
 		entry.tmp = estrndup(filename, filename_len);
 	} else {
-		entry.tmp = expand_filepath(filename, NULL TSRMLS_CC);
+		entry.tmp = expand_filepath(filename, NULL);
 		if (!entry.tmp) {
 			entry.tmp = estrndup(filename, filename_len);
 		}
@@ -209,7 +209,7 @@ int phar_mount_entry(phar_archive_data *phar, char *filename, int filename_len,
 	filename = entry.tmp;
 
 	/* only check openbasedir for files, not for phar streams */
-	if (!is_phar && php_check_open_basedir(filename TSRMLS_CC)) {
+	if (!is_phar && php_check_open_basedir(filename)) {
 		efree(entry.tmp);
 		efree(entry.filename);
 		return FAILURE;
@@ -250,7 +250,7 @@ int phar_mount_entry(phar_archive_data *phar, char *filename, int filename_len,
 }
 /* }}} */
 
-char *phar_find_in_include_path(char *filename, int filename_len, phar_archive_data **pphar TSRMLS_DC) /* {{{ */
+char *phar_find_in_include_path(char *filename, int filename_len, phar_archive_data **pphar) /* {{{ */
 {
 	char *path, *fname, *arch, *entry, *ret, *test;
 	int arch_len, entry_len, fname_len, ret_len;
@@ -262,11 +262,11 @@ char *phar_find_in_include_path(char *filename, int filename_len, phar_archive_d
 		pphar = &phar;
 	}
 
-	if (!zend_is_executing(TSRMLS_C) || !PHAR_G(cwd)) {
-		return phar_save_resolve_path(filename, filename_len TSRMLS_CC);
+	if (!zend_is_executing() || !PHAR_G(cwd)) {
+		return phar_save_resolve_path(filename, filename_len);
 	}
 
-	fname = (char*)zend_get_executed_filename(TSRMLS_C);
+	fname = (char*)zend_get_executed_filename();
 	fname_len = strlen(fname);
 
 	if (PHAR_G(last_phar) && !memcmp(fname, "phar://", 7) && fname_len - 7 >= PHAR_G(last_phar_name_len) && !memcmp(fname + 7, PHAR_G(last_phar_name), PHAR_G(last_phar_name_len))) {
@@ -276,8 +276,8 @@ char *phar_find_in_include_path(char *filename, int filename_len, phar_archive_d
 		goto splitted;
 	}
 
-	if (fname_len < 7 || memcmp(fname, "phar://", 7) || SUCCESS != phar_split_fname(fname, strlen(fname), &arch, &arch_len, &entry, &entry_len, 1, 0 TSRMLS_CC)) {
-		return phar_save_resolve_path(filename, filename_len TSRMLS_CC);
+	if (fname_len < 7 || memcmp(fname, "phar://", 7) || SUCCESS != phar_split_fname(fname, strlen(fname), &arch, &arch_len, &entry, &entry_len, 1, 0)) {
+		return phar_save_resolve_path(filename, filename_len);
 	}
 
 	efree(entry);
@@ -285,9 +285,9 @@ char *phar_find_in_include_path(char *filename, int filename_len, phar_archive_d
 	if (*filename == '.') {
 		int try_len;
 
-		if (FAILURE == phar_get_archive(&phar, arch, arch_len, NULL, 0, NULL TSRMLS_CC)) {
+		if (FAILURE == phar_get_archive(&phar, arch, arch_len, NULL, 0, NULL)) {
 			efree(arch);
-			return phar_save_resolve_path(filename, filename_len TSRMLS_CC);
+			return phar_save_resolve_path(filename, filename_len);
 		}
 splitted:
 		if (pphar) {
@@ -295,7 +295,7 @@ splitted:
 		}
 
 		try_len = filename_len;
-		test = phar_fix_filepath(estrndup(filename, filename_len), &try_len, 1 TSRMLS_CC);
+		test = phar_fix_filepath(estrndup(filename, filename_len), &try_len, 1);
 
 		if (*test == '/') {
 			if (zend_hash_str_exists(&(phar->manifest), test + 1, try_len - 1)) {
@@ -317,14 +317,14 @@ splitted:
 
 	spprintf(&path, MAXPATHLEN, "phar://%s/%s%c%s", arch, PHAR_G(cwd), DEFAULT_DIR_SEPARATOR, PG(include_path));
 	efree(arch);
-	ret = php_resolve_path(filename, filename_len, path TSRMLS_CC);
+	ret = php_resolve_path(filename, filename_len, path);
 	efree(path);
 
 	if (ret && strlen(ret) > 8 && !strncmp(ret, "phar://", 7)) {
 		ret_len = strlen(ret);
 		/* found phar:// */
 
-		if (SUCCESS != phar_split_fname(ret, ret_len, &arch, &arch_len, &entry, &entry_len, 1, 0 TSRMLS_CC)) {
+		if (SUCCESS != phar_split_fname(ret, ret_len, &arch, &arch_len, &entry, &entry_len, 1, 0)) {
 			return ret;
 		}
 
@@ -350,7 +350,7 @@ splitted:
  * appended, truncated, or read.  For read, if the entry is marked unmodified, it is
  * assumed that the file pointer, if present, is opened for reading
  */
-int phar_get_entry_data(phar_entry_data **ret, char *fname, int fname_len, char *path, int path_len, const char *mode, char allow_dir, char **error, int security TSRMLS_DC) /* {{{ */
+int phar_get_entry_data(phar_entry_data **ret, char *fname, int fname_len, char *path, int path_len, const char *mode, char allow_dir, char **error, int security) /* {{{ */
 {
 	phar_archive_data *phar;
 	phar_entry_info *entry;
@@ -369,7 +369,7 @@ int phar_get_entry_data(phar_entry_data **ret, char *fname, int fname_len, char
 		*error = NULL;
 	}
 
-	if (FAILURE == phar_get_archive(&phar, fname, fname_len, NULL, 0, error TSRMLS_CC)) {
+	if (FAILURE == phar_get_archive(&phar, fname, fname_len, NULL, 0, error)) {
 		return FAILURE;
 	}
 
@@ -388,14 +388,14 @@ int phar_get_entry_data(phar_entry_data **ret, char *fname, int fname_len, char
 	}
 really_get_entry:
 	if (allow_dir) {
-		if ((entry = phar_get_entry_info_dir(phar, path, path_len, allow_dir, for_create && !PHAR_G(readonly) && !phar->is_data ? NULL : error, security TSRMLS_CC)) == NULL) {
+		if ((entry = phar_get_entry_info_dir(phar, path, path_len, allow_dir, for_create && !PHAR_G(readonly) && !phar->is_data ? NULL : error, security)) == NULL) {
 			if (for_create && (!PHAR_G(readonly) || phar->is_data)) {
 				return SUCCESS;
 			}
 			return FAILURE;
 		}
 	} else {
-		if ((entry = phar_get_entry_info(phar, path, path_len, for_create && !PHAR_G(readonly) && !phar->is_data ? NULL : error, security TSRMLS_CC)) == NULL) {
+		if ((entry = phar_get_entry_info(phar, path, path_len, for_create && !PHAR_G(readonly) && !phar->is_data ? NULL : error, security)) == NULL) {
 			if (for_create && (!PHAR_G(readonly) || phar->is_data)) {
 				return SUCCESS;
 			}
@@ -404,7 +404,7 @@ really_get_entry:
 	}
 
 	if (for_write && phar->is_persistent) {
-		if (FAILURE == phar_copy_on_write(&phar TSRMLS_CC)) {
+		if (FAILURE == phar_copy_on_write(&phar)) {
 			if (error) {
 				spprintf(error, 4096, "phar error: file \"%s\" in phar \"%s\" cannot be opened for writing, could not make cached phar writeable", path, fname);
 			}
@@ -455,11 +455,11 @@ really_get_entry:
 
 	if (entry->fp_type == PHAR_MOD) {
 		if (for_trunc) {
-			if (FAILURE == phar_create_writeable_entry(phar, entry, error TSRMLS_CC)) {
+			if (FAILURE == phar_create_writeable_entry(phar, entry, error)) {
 				return FAILURE;
 			}
 		} else if (for_append) {
-			phar_seek_efp(entry, 0, SEEK_END, 0, 0 TSRMLS_CC);
+			phar_seek_efp(entry, 0, SEEK_END, 0, 0);
 		}
 	} else {
 		if (for_write) {
@@ -470,16 +470,16 @@ really_get_entry:
 			}
 
 			if (for_trunc) {
-				if (FAILURE == phar_create_writeable_entry(phar, entry, error TSRMLS_CC)) {
+				if (FAILURE == phar_create_writeable_entry(phar, entry, error)) {
 					return FAILURE;
 				}
 			} else {
-				if (FAILURE == phar_separate_entry_fp(entry, error TSRMLS_CC)) {
+				if (FAILURE == phar_separate_entry_fp(entry, error)) {
 					return FAILURE;
 				}
 			}
 		} else {
-			if (FAILURE == phar_open_entry_fp(entry, error, 1 TSRMLS_CC)) {
+			if (FAILURE == phar_open_entry_fp(entry, error, 1)) {
 				return FAILURE;
 			}
 		}
@@ -492,11 +492,11 @@ really_get_entry:
 	(*ret)->internal_file = entry;
 	(*ret)->is_zip = entry->is_zip;
 	(*ret)->is_tar = entry->is_tar;
-	(*ret)->fp = phar_get_efp(entry, 1 TSRMLS_CC);
+	(*ret)->fp = phar_get_efp(entry, 1);
 	if (entry->link) {
-		(*ret)->zero = phar_get_fp_offset(phar_get_link_source(entry TSRMLS_CC) TSRMLS_CC);
+		(*ret)->zero = phar_get_fp_offset(phar_get_link_source(entry));
 	} else {
-		(*ret)->zero = phar_get_fp_offset(entry TSRMLS_CC);
+		(*ret)->zero = phar_get_fp_offset(entry);
 	}
 
 	if (!phar->is_persistent) {
@@ -511,7 +511,7 @@ really_get_entry:
 /**
  * Create a new dummy file slot within a writeable phar for a newly created file
  */
-phar_entry_data *phar_get_or_create_entry_data(char *fname, int fname_len, char *path, int path_len, const char *mode, char allow_dir, char **error, int security TSRMLS_DC) /* {{{ */
+phar_entry_data *phar_get_or_create_entry_data(char *fname, int fname_len, char *path, int path_len, const char *mode, char allow_dir, char **error, int security) /* {{{ */
 {
 	phar_archive_data *phar;
 	phar_entry_info *entry, etemp;
@@ -525,11 +525,11 @@ phar_entry_data *phar_get_or_create_entry_data(char *fname, int fname_len, char
 
 	is_dir = (path_len && path[path_len - 1] == '/') ? 1 : 0;
 
-	if (FAILURE == phar_get_archive(&phar, fname, fname_len, NULL, 0, error TSRMLS_CC)) {
+	if (FAILURE == phar_get_archive(&phar, fname, fname_len, NULL, 0, error)) {
 		return NULL;
 	}
 
-	if (FAILURE == phar_get_entry_data(&ret, fname, fname_len, path, path_len, mode, allow_dir, error, security TSRMLS_CC)) {
+	if (FAILURE == phar_get_entry_data(&ret, fname, fname_len, path, path_len, mode, allow_dir, error, security)) {
 		return NULL;
 	} else if (ret) {
 		return ret;
@@ -542,7 +542,7 @@ phar_entry_data *phar_get_or_create_entry_data(char *fname, int fname_len, char
 		return NULL;
 	}
 
-	if (phar->is_persistent && FAILURE == phar_copy_on_write(&phar TSRMLS_CC)) {
+	if (phar->is_persistent && FAILURE == phar_copy_on_write(&phar)) {
 		if (error) {
 			spprintf(error, 4096, "phar error: file \"%s\" in phar \"%s\" cannot be created, could not make cached phar writeable", path, fname);
 		}
@@ -579,7 +579,7 @@ phar_entry_data *phar_get_or_create_entry_data(char *fname, int fname_len, char
 		path_len--;
 	}
 
-	phar_add_virtual_dirs(phar, path, path_len TSRMLS_CC);
+	phar_add_virtual_dirs(phar, path, path_len);
 	etemp.is_modified = 1;
 	etemp.timestamp = time(0);
 	etemp.is_crc_checked = 1;
@@ -623,19 +623,19 @@ phar_entry_data *phar_get_or_create_entry_data(char *fname, int fname_len, char
 /* }}} */
 
 /* initialize a phar_archive_data's read-only fp for existing phar data */
-int phar_open_archive_fp(phar_archive_data *phar TSRMLS_DC) /* {{{ */
+int phar_open_archive_fp(phar_archive_data *phar) /* {{{ */
 {
-	if (phar_get_pharfp(phar TSRMLS_CC)) {
+	if (phar_get_pharfp(phar)) {
 		return SUCCESS;
 	}
 
-	if (php_check_open_basedir(phar->fname TSRMLS_CC)) {
+	if (php_check_open_basedir(phar->fname)) {
 		return FAILURE;
 	}
 
-	phar_set_pharfp(phar, php_stream_open_wrapper(phar->fname, "rb", IGNORE_URL|STREAM_MUST_SEEK|0, NULL) TSRMLS_CC);
+	phar_set_pharfp(phar, php_stream_open_wrapper(phar->fname, "rb", IGNORE_URL|STREAM_MUST_SEEK|0, NULL));
 
-	if (!phar_get_pharfp(phar TSRMLS_CC)) {
+	if (!phar_get_pharfp(phar)) {
 		return FAILURE;
 	}
 
@@ -644,11 +644,11 @@ int phar_open_archive_fp(phar_archive_data *phar TSRMLS_DC) /* {{{ */
 /* }}} */
 
 /* copy file data from an existing to a new phar_entry_info that is not in the manifest */
-int phar_copy_entry_fp(phar_entry_info *source, phar_entry_info *dest, char **error TSRMLS_DC) /* {{{ */
+int phar_copy_entry_fp(phar_entry_info *source, phar_entry_info *dest, char **error) /* {{{ */
 {
 	phar_entry_info *link;
 
-	if (FAILURE == phar_open_entry_fp(source, error, 1 TSRMLS_CC)) {
+	if (FAILURE == phar_open_entry_fp(source, error, 1)) {
 		return FAILURE;
 	}
 
@@ -666,14 +666,14 @@ int phar_copy_entry_fp(phar_entry_info *source, phar_entry_info *dest, char **er
 		spprintf(error, 0, "phar error: unable to create temporary file");
 		return EOF;
 	}
-	phar_seek_efp(source, 0, SEEK_SET, 0, 1 TSRMLS_CC);
-	link = phar_get_link_source(source TSRMLS_CC);
+	phar_seek_efp(source, 0, SEEK_SET, 0, 1);
+	link = phar_get_link_source(source);
 
 	if (!link) {
 		link = source;
 	}
 
-	if (SUCCESS != php_stream_copy_to_stream_ex(phar_get_efp(link, 0 TSRMLS_CC), dest->fp, link->uncompressed_filesize, NULL)) {
+	if (SUCCESS != php_stream_copy_to_stream_ex(phar_get_efp(link, 0), dest->fp, link->uncompressed_filesize, NULL)) {
 		php_stream_close(dest->fp);
 		dest->fp_type = PHAR_FP;
 		if (error) {
@@ -688,7 +688,7 @@ int phar_copy_entry_fp(phar_entry_info *source, phar_entry_info *dest, char **er
 
 /* open and decompress a compressed phar entry
  */
-int phar_open_entry_fp(phar_entry_info *entry, char **error, int follow_links TSRMLS_DC) /* {{{ */
+int phar_open_entry_fp(phar_entry_info *entry, char **error, int follow_links) /* {{{ */
 {
 	php_stream_filter *filter;
 	phar_archive_data *phar = entry->phar;
@@ -698,9 +698,9 @@ int phar_open_entry_fp(phar_entry_info *entry, char **error, int follow_links TS
 	phar_entry_data dummy;
 
 	if (follow_links && entry->link) {
-		phar_entry_info *link_entry = phar_get_link_source(entry TSRMLS_CC);
+		phar_entry_info *link_entry = phar_get_link_source(entry);
 		if (link_entry && link_entry != entry) {
-			return phar_open_entry_fp(link_entry, error, 1 TSRMLS_CC);
+			return phar_open_entry_fp(link_entry, error, 1);
 		}
 	}
 
@@ -720,8 +720,8 @@ int phar_open_entry_fp(phar_entry_info *entry, char **error, int follow_links TS
 		return SUCCESS;
 	}
 
-	if (!phar_get_pharfp(phar TSRMLS_CC)) {
-		if (FAILURE == phar_open_archive_fp(phar TSRMLS_CC)) {
+	if (!phar_get_pharfp(phar)) {
+		if (FAILURE == phar_open_archive_fp(phar)) {
 			spprintf(error, 4096, "phar error: Cannot open phar archive \"%s\" for reading", phar->fname);
 			return FAILURE;
 		}
@@ -731,16 +731,16 @@ int phar_open_entry_fp(phar_entry_info *entry, char **error, int follow_links TS
 		dummy.internal_file = entry;
 		dummy.phar = phar;
 		dummy.zero = entry->offset;
-		dummy.fp = phar_get_pharfp(phar TSRMLS_CC);
-		if (FAILURE == phar_postprocess_file(&dummy, entry->crc32, error, 1 TSRMLS_CC)) {
+		dummy.fp = phar_get_pharfp(phar);
+		if (FAILURE == phar_postprocess_file(&dummy, entry->crc32, error, 1)) {
 			return FAILURE;
 		}
 		return SUCCESS;
 	}
 
-	if (!phar_get_entrypufp(entry TSRMLS_CC)) {
-		phar_set_entrypufp(entry, php_stream_fopen_tmpfile() TSRMLS_CC);
-		if (!phar_get_entrypufp(entry TSRMLS_CC)) {
+	if (!phar_get_entrypufp(entry)) {
+		phar_set_entrypufp(entry, php_stream_fopen_tmpfile());
+		if (!phar_get_entrypufp(entry)) {
 			spprintf(error, 4096, "phar error: Cannot open temporary file for decompressing phar archive \"%s\" file \"%s\"", phar->fname, entry->filename);
 			return FAILURE;
 		}
@@ -749,15 +749,15 @@ int phar_open_entry_fp(phar_entry_info *entry, char **error, int follow_links TS
 	dummy.internal_file = entry;
 	dummy.phar = phar;
 	dummy.zero = entry->offset;
-	dummy.fp = phar_get_pharfp(phar TSRMLS_CC);
-	if (FAILURE == phar_postprocess_file(&dummy, entry->crc32, error, 1 TSRMLS_CC)) {
+	dummy.fp = phar_get_pharfp(phar);
+	if (FAILURE == phar_postprocess_file(&dummy, entry->crc32, error, 1)) {
 		return FAILURE;
 	}
 
-	ufp = phar_get_entrypufp(entry TSRMLS_CC);
+	ufp = phar_get_entrypufp(entry);
 
 	if ((filtername = phar_decompress_filter(entry, 0)) != NULL) {
-		filter = php_stream_filter_create(filtername, NULL, 0 TSRMLS_CC);
+		filter = php_stream_filter_create(filtername, NULL, 0);
 	} else {
 		filter = NULL;
 	}
@@ -772,19 +772,19 @@ int phar_open_entry_fp(phar_entry_info *entry, char **error, int follow_links TS
 	php_stream_seek(ufp, 0, SEEK_END);
 	loc = php_stream_tell(ufp);
 	php_stream_filter_append(&ufp->writefilters, filter);
-	php_stream_seek(phar_get_entrypfp(entry TSRMLS_CC), phar_get_fp_offset(entry TSRMLS_CC), SEEK_SET);
+	php_stream_seek(phar_get_entrypfp(entry), phar_get_fp_offset(entry), SEEK_SET);
 
 	if (entry->uncompressed_filesize) {
-		if (SUCCESS != php_stream_copy_to_stream_ex(phar_get_entrypfp(entry TSRMLS_CC), ufp, entry->compressed_filesize, NULL)) {
+		if (SUCCESS != php_stream_copy_to_stream_ex(phar_get_entrypfp(entry), ufp, entry->compressed_filesize, NULL)) {
 			spprintf(error, 4096, "phar error: internal corruption of phar \"%s\" (actual filesize mismatch on file \"%s\")", phar->fname, entry->filename);
-			php_stream_filter_remove(filter, 1 TSRMLS_CC);
+			php_stream_filter_remove(filter, 1);
 			return FAILURE;
 		}
 	}
 
 	php_stream_filter_flush(filter, 1);
 	php_stream_flush(ufp);
-	php_stream_filter_remove(filter, 1 TSRMLS_CC);
+	php_stream_filter_remove(filter, 1);
 
 	if (php_stream_tell(ufp) - loc != (zend_off_t) entry->uncompressed_filesize) {
 		spprintf(error, 4096, "phar error: internal corruption of phar \"%s\" (actual filesize mismatch on file \"%s\")", phar->fname, entry->filename);
@@ -794,17 +794,17 @@ int phar_open_entry_fp(phar_entry_info *entry, char **error, int follow_links TS
 	entry->old_flags = entry->flags;
 
 	/* this is now the new location of the file contents within this fp */
-	phar_set_fp_type(entry, PHAR_UFP, loc TSRMLS_CC);
+	phar_set_fp_type(entry, PHAR_UFP, loc);
 	dummy.zero = entry->offset;
 	dummy.fp = ufp;
-	if (FAILURE == phar_postprocess_file(&dummy, entry->crc32, error, 0 TSRMLS_CC)) {
+	if (FAILURE == phar_postprocess_file(&dummy, entry->crc32, error, 0)) {
 		return FAILURE;
 	}
 	return SUCCESS;
 }
 /* }}} */
 
-int phar_create_writeable_entry(phar_archive_data *phar, phar_entry_info *entry, char **error TSRMLS_DC) /* {{{ */
+int phar_create_writeable_entry(phar_archive_data *phar, phar_entry_info *entry, char **error) /* {{{ */
 {
 	if (entry->fp_type == PHAR_MOD) {
 		/* already newly created, truncate */
@@ -857,12 +857,12 @@ int phar_create_writeable_entry(phar_archive_data *phar, phar_entry_info *entry,
 }
 /* }}} */
 
-int phar_separate_entry_fp(phar_entry_info *entry, char **error TSRMLS_DC) /* {{{ */
+int phar_separate_entry_fp(phar_entry_info *entry, char **error) /* {{{ */
 {
 	php_stream *fp;
 	phar_entry_info *link;
 
-	if (FAILURE == phar_open_entry_fp(entry, error, 1 TSRMLS_CC)) {
+	if (FAILURE == phar_open_entry_fp(entry, error, 1)) {
 		return FAILURE;
 	}
 
@@ -875,14 +875,14 @@ int phar_separate_entry_fp(phar_entry_info *entry, char **error TSRMLS_DC) /* {{
 		spprintf(error, 0, "phar error: unable to create temporary file");
 		return FAILURE;
 	}
-	phar_seek_efp(entry, 0, SEEK_SET, 0, 1 TSRMLS_CC);
-	link = phar_get_link_source(entry TSRMLS_CC);
+	phar_seek_efp(entry, 0, SEEK_SET, 0, 1);
+	link = phar_get_link_source(entry);
 
 	if (!link) {
 		link = entry;
 	}
 
-	if (SUCCESS != php_stream_copy_to_stream_ex(phar_get_efp(link, 0 TSRMLS_CC), fp, link->uncompressed_filesize, NULL)) {
+	if (SUCCESS != php_stream_copy_to_stream_ex(phar_get_efp(link, 0), fp, link->uncompressed_filesize, NULL)) {
 		if (error) {
 			spprintf(error, 4096, "phar error: cannot separate entry file \"%s\" contents in phar archive \"%s\" for write access", entry->filename, entry->phar->fname);
 		}
@@ -906,16 +906,16 @@ int phar_separate_entry_fp(phar_entry_info *entry, char **error TSRMLS_DC) /* {{
 /**
  * helper function to open an internal file's fp just-in-time
  */
-phar_entry_info * phar_open_jit(phar_archive_data *phar, phar_entry_info *entry, char **error TSRMLS_DC) /* {{{ */
+phar_entry_info * phar_open_jit(phar_archive_data *phar, phar_entry_info *entry, char **error) /* {{{ */
 {
 	if (error) {
 		*error = NULL;
 	}
 	/* seek to start of internal file and read it */
-	if (FAILURE == phar_open_entry_fp(entry, error, 1 TSRMLS_CC)) {
+	if (FAILURE == phar_open_entry_fp(entry, error, 1)) {
 		return NULL;
 	}
-	if (-1 == phar_seek_efp(entry, 0, SEEK_SET, 0, 1 TSRMLS_CC)) {
+	if (-1 == phar_seek_efp(entry, 0, SEEK_SET, 0, 1)) {
 		spprintf(error, 4096, "phar error: cannot seek to start of file \"%s\" in phar \"%s\"", entry->filename, phar->fname);
 		return NULL;
 	}
@@ -923,7 +923,7 @@ phar_entry_info * phar_open_jit(phar_archive_data *phar, phar_entry_info *entry,
 }
 /* }}} */
 
-PHP_PHAR_API int phar_resolve_alias(char *alias, int alias_len, char **filename, int *filename_len TSRMLS_DC) /* {{{ */ {
+PHP_PHAR_API int phar_resolve_alias(char *alias, int alias_len, char **filename, int *filename_len) /* {{{ */ {
 	phar_archive_data *fd_ptr;
 	if (PHAR_GLOBALS->phar_alias_map.arHash
 			&& NULL != (fd_ptr = zend_hash_str_find_ptr(&(PHAR_GLOBALS->phar_alias_map), alias, alias_len))) {
@@ -935,7 +935,7 @@ PHP_PHAR_API int phar_resolve_alias(char *alias, int alias_len, char **filename,
 }
 /* }}} */
 
-int phar_free_alias(phar_archive_data *phar, char *alias, int alias_len TSRMLS_DC) /* {{{ */
+int phar_free_alias(phar_archive_data *phar, char *alias, int alias_len) /* {{{ */
 {
 	if (phar->refcount || phar->is_persistent) {
 		return FAILURE;
@@ -958,13 +958,13 @@ int phar_free_alias(phar_archive_data *phar, char *alias, int alias_len TSRMLS_D
  * Looks up a phar archive in the filename map, connecting it to the alias
  * (if any) or returns null
  */
-int phar_get_archive(phar_archive_data **archive, char *fname, int fname_len, char *alias, int alias_len, char **error TSRMLS_DC) /* {{{ */
+int phar_get_archive(phar_archive_data **archive, char *fname, int fname_len, char *alias, int alias_len, char **error) /* {{{ */
 {
 	phar_archive_data *fd, *fd_ptr;
 	char *my_realpath, *save;
 	int save_len;
 
-	phar_request_initialize(TSRMLS_C);
+	phar_request_initialize();
 
 	if (error) {
 		*error = NULL;
@@ -1009,7 +1009,7 @@ alias_success:
 				if (error) {
 					spprintf(error, 0, "alias \"%s\" is already used for archive \"%s\" cannot be overloaded with \"%s\"", alias, fd_ptr->fname, fname);
 				}
-				if (SUCCESS == phar_free_alias(fd_ptr, alias, alias_len TSRMLS_CC)) {
+				if (SUCCESS == phar_free_alias(fd_ptr, alias, alias_len)) {
 					if (error) {
 						efree(*error);
 						*error = NULL;
@@ -1116,7 +1116,7 @@ alias_success:
 		}
 
 		/* not found, try converting \ to / */
-		my_realpath = expand_filepath(fname, my_realpath TSRMLS_CC);
+		my_realpath = expand_filepath(fname, my_realpath);
 
 		if (my_realpath) {
 			fname_len = strlen(my_realpath);
@@ -1202,9 +1202,9 @@ char * phar_decompress_filter(phar_entry_info * entry, int return_unknown) /* {{
 /**
  * retrieve information on a file contained within a phar, or null if it ain't there
  */
-phar_entry_info *phar_get_entry_info(phar_archive_data *phar, char *path, int path_len, char **error, int security TSRMLS_DC) /* {{{ */
+phar_entry_info *phar_get_entry_info(phar_archive_data *phar, char *path, int path_len, char **error, int security) /* {{{ */
 {
-	return phar_get_entry_info_dir(phar, path, path_len, 0, error, security TSRMLS_CC);
+	return phar_get_entry_info_dir(phar, path, path_len, 0, error, security);
 }
 /* }}} */
 /**
@@ -1212,7 +1212,7 @@ phar_entry_info *phar_get_entry_info(phar_archive_data *phar, char *path, int pa
  * allow_dir is 0 for none, 1 for both empty directories in the phar and temp directories, and 2 for only
  * valid pre-existing empty directory entries
  */
-phar_entry_info *phar_get_entry_info_dir(phar_archive_data *phar, char *path, int path_len, char dir, char **error, int security TSRMLS_DC) /* {{{ */
+phar_entry_info *phar_get_entry_info_dir(phar_archive_data *phar, char *path, int path_len, char dir, char **error, int security) /* {{{ */
 {
 	const char *pcr_error;
 	phar_entry_info *entry;
@@ -1344,7 +1344,7 @@ phar_entry_info *phar_get_entry_info_dir(phar_archive_data *phar, char *path, in
 				}
 
 				/* mount the file just in time */
-				if (SUCCESS != phar_mount_entry(phar, test, test_len, path, path_len TSRMLS_CC)) {
+				if (SUCCESS != phar_mount_entry(phar, test, test_len, path, path_len)) {
 					efree(test);
 					if (error) {
 						spprintf(error, 4096, "phar error: path \"%s\" exists as file \"%s\" and could not be mounted", path, test);
@@ -1371,7 +1371,7 @@ phar_entry_info *phar_get_entry_info_dir(phar_archive_data *phar, char *path, in
 
 static const char hexChars[] = "0123456789ABCDEF";
 
-static int phar_hex_str(const char *digest, size_t digest_len, char **signature TSRMLS_DC) /* {{{ */
+static int phar_hex_str(const char *digest, size_t digest_len, char **signature) /* {{{ */
 {
 	int pos = -1;
 	size_t len = 0;
@@ -1388,7 +1388,7 @@ static int phar_hex_str(const char *digest, size_t digest_len, char **signature
 /* }}} */
 
 #ifndef PHAR_HAVE_OPENSSL
-static int phar_call_openssl_signverify(int is_sign, php_stream *fp, zend_off_t end, char *key, int key_len, char **signature, int *signature_len TSRMLS_DC) /* {{{ */
+static int phar_call_openssl_signverify(int is_sign, php_stream *fp, zend_off_t end, char *key, int key_len, char **signature, int *signature_len) /* {{{ */
 {
 	zend_fcall_info fci;
 	zend_fcall_info_cache fcc;
@@ -1414,7 +1414,7 @@ static int phar_call_openssl_signverify(int is_sign, php_stream *fp, zend_off_t
 		return FAILURE;
 	}
 
-	if (FAILURE == zend_fcall_info_init(&openssl, 0, &fci, &fcc, NULL, NULL TSRMLS_CC)) {
+	if (FAILURE == zend_fcall_info_init(&openssl, 0, &fci, &fcc, NULL, NULL)) {
 		zval_dtor(&zp[0]);
 		zval_dtor(&zp[1]);
 		zval_dtor(&zp[2]);
@@ -1434,7 +1434,7 @@ static int phar_call_openssl_signverify(int is_sign, php_stream *fp, zend_off_t
 
 	fci.retval = &retval;
 
-	if (FAILURE == zend_call_function(&fci, &fcc TSRMLS_CC)) {
+	if (FAILURE == zend_call_function(&fci, &fcc)) {
 		zval_dtor(&zp[0]);
 		zval_dtor(&zp[1]);
 		zval_dtor(&zp[2]);
@@ -1476,7 +1476,7 @@ static int phar_call_openssl_signverify(int is_sign, php_stream *fp, zend_off_t
 /* }}} */
 #endif /* #ifndef PHAR_HAVE_OPENSSL */
 
-int phar_verify_signature(php_stream *fp, size_t end_of_phar, php_uint32 sig_type, char *sig, int sig_len, char *fname, char **signature, int *signature_len, char **error TSRMLS_DC) /* {{{ */
+int phar_verify_signature(php_stream *fp, size_t end_of_phar, php_uint32 sig_type, char *sig, int sig_len, char *fname, char **signature, int *signature_len, char **error) /* {{{ */
 {
 	int read_size, len;
 	zend_off_t read_len;
@@ -1524,7 +1524,7 @@ int phar_verify_signature(php_stream *fp, size_t end_of_phar, php_uint32 sig_typ
 #ifndef PHAR_HAVE_OPENSSL
 			tempsig = sig_len;
 
-			if (FAILURE == phar_call_openssl_signverify(0, fp, end_of_phar, pubkey ? pubkey->val : NULL, pubkey ? pubkey->len : 0, &sig, &tempsig TSRMLS_CC)) {
+			if (FAILURE == phar_call_openssl_signverify(0, fp, end_of_phar, pubkey ? pubkey->val : NULL, pubkey ? pubkey->len : 0, &sig, &tempsig)) {
 				if (pubkey) {
 					zend_string_release(pubkey);
 				}
@@ -1597,7 +1597,7 @@ int phar_verify_signature(php_stream *fp, size_t end_of_phar, php_uint32 sig_typ
 			EVP_MD_CTX_cleanup(&md_ctx);
 #endif
 
-			*signature_len = phar_hex_str((const char*)sig, sig_len, signature TSRMLS_CC);
+			*signature_len = phar_hex_str((const char*)sig, sig_len, signature);
 		}
 		break;
 #ifdef PHAR_HASH_OK
@@ -1631,7 +1631,7 @@ int phar_verify_signature(php_stream *fp, size_t end_of_phar, php_uint32 sig_typ
 				return FAILURE;
 			}
 
-			*signature_len = phar_hex_str((const char*)digest, sizeof(digest), signature TSRMLS_CC);
+			*signature_len = phar_hex_str((const char*)digest, sizeof(digest), signature);
 			break;
 		}
 		case PHAR_SIG_SHA256: {
@@ -1664,7 +1664,7 @@ int phar_verify_signature(php_stream *fp, size_t end_of_phar, php_uint32 sig_typ
 				return FAILURE;
 			}
 
-			*signature_len = phar_hex_str((const char*)digest, sizeof(digest), signature TSRMLS_CC);
+			*signature_len = phar_hex_str((const char*)digest, sizeof(digest), signature);
 			break;
 		}
 #else
@@ -1705,7 +1705,7 @@ int phar_verify_signature(php_stream *fp, size_t end_of_phar, php_uint32 sig_typ
 				return FAILURE;
 			}
 
-			*signature_len = phar_hex_str((const char*)digest, sizeof(digest), signature TSRMLS_CC);
+			*signature_len = phar_hex_str((const char*)digest, sizeof(digest), signature);
 			break;
 		}
 		case PHAR_SIG_MD5: {
@@ -1738,7 +1738,7 @@ int phar_verify_signature(php_stream *fp, size_t end_of_phar, php_uint32 sig_typ
 				return FAILURE;
 			}
 
-			*signature_len = phar_hex_str((const char*)digest, sizeof(digest), signature TSRMLS_CC);
+			*signature_len = phar_hex_str((const char*)digest, sizeof(digest), signature);
 			break;
 		}
 		default:
@@ -1751,7 +1751,7 @@ int phar_verify_signature(php_stream *fp, size_t end_of_phar, php_uint32 sig_typ
 }
 /* }}} */
 
-int phar_create_signature(phar_archive_data *phar, php_stream *fp, char **signature, int *signature_length, char **error TSRMLS_DC) /* {{{ */
+int phar_create_signature(phar_archive_data *phar, php_stream *fp, char **signature, int *signature_length, char **error) /* {{{ */
 {
 	unsigned char buf[1024];
 	int sig_len;
@@ -1869,7 +1869,7 @@ int phar_create_signature(phar_archive_data *phar, php_stream *fp, char **signat
 			siglen = 0;
 			php_stream_seek(fp, 0, SEEK_END);
 
-			if (FAILURE == phar_call_openssl_signverify(1, fp, php_stream_tell(fp), PHAR_G(openssl_privatekey), PHAR_G(openssl_privatekey_len), (char **)&sigbuf, &siglen TSRMLS_CC)) {
+			if (FAILURE == phar_call_openssl_signverify(1, fp, php_stream_tell(fp), PHAR_G(openssl_privatekey), PHAR_G(openssl_privatekey_len), (char **)&sigbuf, &siglen)) {
 				if (error) {
 					spprintf(error, 0, "unable to write phar \"%s\" with requested openssl signature", phar->fname);
 				}
@@ -1914,12 +1914,12 @@ int phar_create_signature(phar_archive_data *phar, php_stream *fp, char **signat
 		}
 	}
 
-	phar->sig_len = phar_hex_str((const char *)*signature, *signature_length, &phar->signature TSRMLS_CC);
+	phar->sig_len = phar_hex_str((const char *)*signature, *signature_length, &phar->signature);
 	return SUCCESS;
 }
 /* }}} */
 
-void phar_add_virtual_dirs(phar_archive_data *phar, char *filename, int filename_len TSRMLS_DC) /* {{{ */
+void phar_add_virtual_dirs(phar_archive_data *phar, char *filename, int filename_len) /* {{{ */
 {
 	const char *s;
 
@@ -1932,7 +1932,7 @@ void phar_add_virtual_dirs(phar_archive_data *phar, char *filename, int filename
 }
 /* }}} */
 
-static int phar_update_cached_entry(zval *data, void *argument TSRMLS_DC) /* {{{ */
+static int phar_update_cached_entry(zval *data, void *argument) /* {{{ */
 {
 	phar_entry_info *entry = (phar_entry_info *)Z_PTR_P(data);
 
@@ -1954,7 +1954,7 @@ static int phar_update_cached_entry(zval *data, void *argument TSRMLS_DC) /* {{{
 		if (entry->metadata_len) {
 			char *buf = estrndup((char *) Z_PTR(entry->metadata), entry->metadata_len);
 			/* assume success, we would have failed before */
-			phar_parse_metadata((char **) &buf, &entry->metadata, entry->metadata_len TSRMLS_CC);
+			phar_parse_metadata((char **) &buf, &entry->metadata, entry->metadata_len);
 			efree(buf);
 		} else {
 			zval_copy_ctor(&entry->metadata);
@@ -1973,7 +1973,7 @@ static void phar_manifest_copy_ctor(zval *zv) /* {{{ */
 }
 /* }}} */
 
-static void phar_copy_cached_phar(phar_archive_data **pphar TSRMLS_DC) /* {{{ */
+static void phar_copy_cached_phar(phar_archive_data **pphar) /* {{{ */
 {
 	phar_archive_data *phar;
 	HashTable newmanifest;
@@ -1999,7 +1999,7 @@ static void phar_copy_cached_phar(phar_archive_data **pphar TSRMLS_DC) /* {{{ */
 		/* assume success, we would have failed before */
 		if (phar->metadata_len) {
 			char *buf = estrndup((char *) Z_PTR(phar->metadata), phar->metadata_len);
-			phar_parse_metadata(&buf, &phar->metadata, phar->metadata_len TSRMLS_CC);
+			phar_parse_metadata(&buf, &phar->metadata, phar->metadata_len);
 			efree(buf);
 		} else {
 			zval_copy_ctor(&phar->metadata);
@@ -2009,7 +2009,7 @@ static void phar_copy_cached_phar(phar_archive_data **pphar TSRMLS_DC) /* {{{ */
 	zend_hash_init(&newmanifest, sizeof(phar_entry_info),
 		zend_get_hash_value, destroy_phar_manifest_entry, 0);
 	zend_hash_copy(&newmanifest, &(*pphar)->manifest, phar_manifest_copy_ctor);
-	zend_hash_apply_with_argument(&newmanifest, phar_update_cached_entry, (void *)phar TSRMLS_CC);
+	zend_hash_apply_with_argument(&newmanifest, phar_update_cached_entry, (void *)phar);
 	phar->manifest = newmanifest;
 	zend_hash_init(&phar->mounted_dirs, sizeof(char *),
 		zend_get_hash_value, NULL, 0);
@@ -2027,7 +2027,7 @@ static void phar_copy_cached_phar(phar_archive_data **pphar TSRMLS_DC) /* {{{ */
 }
 /* }}} */
 
-int phar_copy_on_write(phar_archive_data **pphar TSRMLS_DC) /* {{{ */
+int phar_copy_on_write(phar_archive_data **pphar) /* {{{ */
 {
 	zval zv, *pzv;
 	phar_archive_data *newpphar;
@@ -2037,7 +2037,7 @@ int phar_copy_on_write(phar_archive_data **pphar TSRMLS_DC) /* {{{ */
 		return FAILURE;
 	}
 
-	phar_copy_cached_phar((phar_archive_data **)&Z_PTR_P(pzv) TSRMLS_CC);
+	phar_copy_cached_phar((phar_archive_data **)&Z_PTR_P(pzv));
 	newpphar = Z_PTR_P(pzv);
 	/* invalidate phar cache */
 	PHAR_G(last_phar) = NULL;