From 26e5f9bab74c0b19e6312bde594d3961a1b1b572 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Fri, 26 Sep 2014 21:30:22 +0200 Subject: cleanup TSRMLS_FETCH in ext/fileinfo --- ext/fileinfo/libmagic/print.c | 1 - 1 file changed, 1 deletion(-) (limited to 'ext/fileinfo/libmagic/print.c') 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 */ -- cgit v1.2.1 From c00424e427930a33e6d8645cc3f23fb78ed29b9f Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 15 Oct 2014 09:37:55 +0200 Subject: bring back all the TSRMLS_FETCH() stuff for better comparability with the mainstream --- ext/fileinfo/libmagic/print.c | 1 + 1 file changed, 1 insertion(+) (limited to 'ext/fileinfo/libmagic/print.c') diff --git a/ext/fileinfo/libmagic/print.c b/ext/fileinfo/libmagic/print.c index f21ca9c711..eb4e6e8ce4 100644 --- a/ext/fileinfo/libmagic/print.c +++ b/ext/fileinfo/libmagic/print.c @@ -60,6 +60,7 @@ 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 */ -- cgit v1.2.1 From bdeb220f48825642f84cdbf3ff23a30613c92e86 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sat, 13 Dec 2014 23:06:14 +0100 Subject: first shot remove TSRMLS_* things --- ext/fileinfo/libmagic/print.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'ext/fileinfo/libmagic/print.c') diff --git a/ext/fileinfo/libmagic/print.c b/ext/fileinfo/libmagic/print.c index eb4e6e8ce4..7e4a812818 100644 --- a/ext/fileinfo/libmagic/print.c +++ b/ext/fileinfo/libmagic/print.c @@ -60,13 +60,12 @@ 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 */ va_end(va); - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Warning: %s", expanded_format); + php_error_docref(NULL, E_NOTICE, "Warning: %s", expanded_format); free(expanded_format); } -- cgit v1.2.1