cleanup TSRMLS_FETCH in ext/fileinfo

6 files changed, 1 insertions, 17 deletions

diff --git a/ext/fileinfo/libmagic/apprentice.c b/ext/fileinfo/libmagic/apprentice.c
index c1dc5aa1fa..732ed8babb 100644
--- a/ext/fileinfo/libmagic/apprentice.c
+++ b/ext/fileinfo/libmagic/apprentice.c
@@ -960,8 +960,6 @@ load_1(struct magic_set *ms, int action, const char *fn, int *errs,
 
 	php_stream *stream;
 
-	TSRMLS_FETCH();
-
 	ms->file = fn;
 	stream = php_stream_open_wrapper((char *)fn, "rb", REPORT_ERRORS, NULL);
 
@@ -1151,8 +1149,6 @@ apprentice_load(struct magic_set *ms, const char *fn, int action)
 	php_stream *dir;
 	php_stream_dirent d;
  
-	TSRMLS_FETCH();
-
 	memset(mset, 0, sizeof(mset));
 	ms->flags |= MAGIC_CHECK;	/* Enable checks for parsed files */
 
@@ -2607,9 +2603,6 @@ apprentice_map(struct magic_set *ms, const char *fn)
 	php_stream *stream = NULL;
 	php_stream_statbuf st;
 
-
-	TSRMLS_FETCH();
-
 	if ((map = CAST(struct magic_map *, ecalloc(1, sizeof(*map)))) == NULL) {
 		file_oomem(ms, sizeof(*map));
 		efree(map);
@@ -2761,8 +2754,6 @@ apprentice_compile(struct magic_set *ms, struct magic_map *map, const char *fn)
 	uint32_t i;
 	php_stream *stream;
 
-	TSRMLS_FETCH();
-
 	dbname = mkdbname(ms, fn, 0);
 
 	if (dbname == NULL) 
@@ -2820,7 +2811,6 @@ mkdbname(struct magic_set *ms, const char *fn, int strip)
 {
 	const char *p, *q;
 	char *buf;
-	TSRMLS_FETCH();
 
 	if (strip) {
 		if ((p = strrchr(fn, '/')) != NULL)
diff --git a/ext/fileinfo/libmagic/fsmagic.c b/ext/fileinfo/libmagic/fsmagic.c
index a7b420ff5d..0f6f4acbdf 100644
--- a/ext/fileinfo/libmagic/fsmagic.c
+++ b/ext/fileinfo/libmagic/fsmagic.c
@@ -94,7 +94,6 @@ file_fsmagic(struct magic_set *ms, const char *fn, zend_stat_t *sb, php_stream *
 {
 	int ret, did = 0;
 	int mime = ms->flags & MAGIC_MIME;
-	TSRMLS_FETCH();
 
 	if (ms->flags & MAGIC_APPLE)
 		return 0;
diff --git a/ext/fileinfo/libmagic/funcs.c b/ext/fileinfo/libmagic/funcs.c
index c7d9a7e4f1..252cc34589 100644
--- a/ext/fileinfo/libmagic/funcs.c
+++ b/ext/fileinfo/libmagic/funcs.c
@@ -221,7 +221,7 @@ file_buffer(struct magic_set *ms, php_stream *stream, const char *inname, const
 	/* Check if we have a CDF file */
 	if ((ms->flags & MAGIC_NO_CHECK_CDF) == 0) {
 		php_socket_t fd;
-		TSRMLS_FETCH();
+
 		if (stream && SUCCESS == php_stream_cast(stream, PHP_STREAM_AS_FD, (void **)&fd, 0)) {
 			if ((m = file_trycdf(ms, fd, ubuf, nb)) != 0) {
 				if ((ms->flags & MAGIC_DEBUG) != 0)
@@ -445,7 +445,6 @@ file_replace(struct magic_set *ms, const char *pat, const char *rep)
 	zend_string *res;
 	zval repl;
 	int  rep_cnt = 0;
-	TSRMLS_FETCH();
 
 	(void)setlocale(LC_CTYPE, "C");
 
diff --git a/ext/fileinfo/libmagic/magic.c b/ext/fileinfo/libmagic/magic.c
index 7f5cff6a7b..5aeb0084cb 100644
--- a/ext/fileinfo/libmagic/magic.c
+++ b/ext/fileinfo/libmagic/magic.c
@@ -353,7 +353,6 @@ file_or_stream(struct magic_set *ms, const char *inname, php_stream *stream)
 	zend_stat_t   sb;
 	ssize_t nbytes = 0;	/* number of bytes read from a datafile */
 	int no_in_stream = 0;
-	TSRMLS_FETCH();
 
 	if (!inname && !stream) {
 		return NULL;
diff --git a/ext/fileinfo/libmagic/print.c b/ext/fileinfo/libmagic/print.c
index eb4e6e8ce4..f21ca9c711 100644
--- a/ext/fileinfo/libmagic/print.c
+++ b/ext/fileinfo/libmagic/print.c
@@ -60,7 +60,6 @@ file_magwarn(struct magic_set *ms, const char *f, ...)
 {
 	va_list va;
 	char *expanded_format;
-	TSRMLS_FETCH();
 
 	va_start(va, f);
 	if (vasprintf(&expanded_format, f, va)); /* silence */
diff --git a/ext/fileinfo/libmagic/softmagic.c b/ext/fileinfo/libmagic/softmagic.c
index e626929c9e..40f6a52b83 100644
--- a/ext/fileinfo/libmagic/softmagic.c
+++ b/ext/fileinfo/libmagic/softmagic.c
@@ -360,7 +360,6 @@ check_fmt(struct magic_set *ms, struct magic *m)
 	int re_options, rv = -1;
 	pcre_extra *re_extra;
 	zend_string *pattern;
-	TSRMLS_FETCH();
 	
 	if (strchr(m->desc, '%') == NULL)
 		return 0;
@@ -2079,7 +2078,6 @@ magiccheck(struct magic_set *ms, struct magic *m)
 		zval pattern;
 		int options = 0;
 		pcre_cache_entry *pce;
-		TSRMLS_FETCH();
 		
 		options |= PCRE_MULTILINE;