From f7900367116f333b5a4582b29a2c1f7d2d9b6453 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Fri, 26 Sep 2014 11:06:02 +0200 Subject: some cleanups for TSRMLS_FETCH and direct tsrm_ls usage in main --- main/spprintf.c | 1 - 1 file changed, 1 deletion(-) (limited to 'main/spprintf.c') diff --git a/main/spprintf.c b/main/spprintf.c index cf730dd964..903c901abe 100644 --- a/main/spprintf.c +++ b/main/spprintf.c @@ -401,7 +401,6 @@ static void xbuf_format_converter(void *xbuf, zend_bool is_char, const char *fmt */ switch (*fmt) { case 'Z': { - TSRMLS_FETCH(); zvp = (zval*) va_arg(ap, zval*); free_zcopy = zend_make_printable_zval(zvp, &zcopy TSRMLS_CC); if (free_zcopy) { -- 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 --- main/spprintf.c | 1 + 1 file changed, 1 insertion(+) (limited to 'main/spprintf.c') diff --git a/main/spprintf.c b/main/spprintf.c index 903c901abe..cf730dd964 100644 --- a/main/spprintf.c +++ b/main/spprintf.c @@ -401,6 +401,7 @@ static void xbuf_format_converter(void *xbuf, zend_bool is_char, const char *fmt */ switch (*fmt) { case 'Z': { + TSRMLS_FETCH(); zvp = (zval*) va_arg(ap, zval*); free_zcopy = zend_make_printable_zval(zvp, &zcopy TSRMLS_CC); if (free_zcopy) { -- 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 --- main/spprintf.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'main/spprintf.c') diff --git a/main/spprintf.c b/main/spprintf.c index ee73d4f4e5..f860ee3dff 100644 --- a/main/spprintf.c +++ b/main/spprintf.c @@ -410,9 +410,8 @@ static void xbuf_format_converter(void *xbuf, zend_bool is_char, const char *fmt */ switch (*fmt) { case 'Z': { - TSRMLS_FETCH(); - zvp = (zval*) va_arg(ap, zval*); - free_zcopy = zend_make_printable_zval(zvp, &zcopy TSRMLS_CC); + zvp = (zval*) va_arg(ap, zval*); + free_zcopy = zend_make_printable_zval(zvp, &zcopy); if (free_zcopy) { zvp = &zcopy; } -- cgit v1.2.1