1
0
mirror of https://github.com/php/php-src.git synced 2026-04-24 00:18:23 +02:00

Kill another TSRMLS_FETCH() in zend_indent()

This commit is contained in:
Kalle Sommer Nielsen
2013-12-12 22:09:38 +01:00
parent 0fc8e6af0a
commit 1433dec2d0
6 changed files with 7 additions and 8 deletions
+1 -2
View File
@@ -47,7 +47,7 @@ static void handle_whitespace(int *emit_whitespace)
}
ZEND_API void zend_indent()
ZEND_API void zend_indent(TSRMLS_D)
{
zval token;
int token_type;
@@ -55,7 +55,6 @@ ZEND_API void zend_indent()
int nest_level=0;
int emit_whitespace[256];
int i;
TSRMLS_FETCH();
memset(emit_whitespace, 0, sizeof(int)*256);
+1 -1
View File
@@ -23,7 +23,7 @@
#define ZEND_INDENT_H
BEGIN_EXTERN_C()
ZEND_API void zend_indent(void);
ZEND_API void zend_indent(TSRMLS_D);
END_EXTERN_C()
#endif /* ZEND_INDENT_H */
+2 -2
View File
@@ -2643,9 +2643,9 @@ PHPAPI int php_lint_script(zend_file_handle *file TSRMLS_DC)
#ifdef PHP_WIN32
/* {{{ dummy_indent
just so that this symbol gets exported... */
PHPAPI void dummy_indent(void)
PHPAPI void dummy_indent(TSRMLS_D)
{
zend_indent();
zend_indent(TSRMLS_C);
}
/* }}} */
#endif
+1 -1
View File
@@ -2493,7 +2493,7 @@ consult the installation file that came with this distribution, or visit \n\
/* Zeev might want to do something with this one day */
case PHP_MODE_INDENT:
open_file_for_scanning(&file_handle TSRMLS_CC);
zend_indent();
zend_indent(TSRMLS_C);
zend_file_handle_dtor(&file_handle TSRMLS_CC);
php_output_teardown();
return SUCCESS;
+1 -1
View File
@@ -1024,7 +1024,7 @@ static int do_cli(int argc, char **argv TSRMLS_DC) /* {{{ */
/* Zeev might want to do something with this one day */
case PHP_MODE_INDENT:
open_file_for_scanning(&file_handle TSRMLS_CC);
zend_indent();
zend_indent(TSRMLS_C);
zend_file_handle_dtor(file_handle.handle TSRMLS_CC);
goto out;
break;
+1 -1
View File
@@ -385,7 +385,7 @@ MODULE_API DWORD PHP5_wrapper(LPCONTROL_BLOCK lpCB)
}
if ( open_file_for_scanning( &file_handle TSRMLS_CC ) == SUCCESS )
{
zend_indent();
zend_indent(TSRMLS_C);
}
else
{