Kill another TSRMLS_FETCH() in zend_indent()

diff --git a/Zend/zend_indent.c b/Zend/zend_indent.c
index fea78d9c57daf4021cee82dee229db8f3974165c..42e4321b3db86e3d6d3c41370e430b7ef55bf465 100644 (file)
--- a/Zend/zend_indent.c
+++ b/Zend/zend_indent.c
@@ -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);
 

diff --git a/Zend/zend_indent.h b/Zend/zend_indent.h
index bba02a738b3dc6835084b3c2a0dd0aad28f18e67..f38e87eaefbe9723d06aaa1a2ca31ed5e088ef91 100644 (file)
--- a/Zend/zend_indent.h
+++ b/Zend/zend_indent.h
@@ -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 */

diff --git a/main/main.c b/main/main.c
index 6f7e149cad332cd68ff7ca9d55c05ab60c4c3476..05b34b7f3ab852ba6c24c20c5a977a626ef747eb 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -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

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index c36729437a53b01c196ce0291e621328cf7c1e99..ea75ee83ba12e47ff04c02d89d66602ad12b651e 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -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;

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 9f3fc4b5b73a93af5a83bda539c74ddd1dca19fd..eec117ab1f984db509d26f3d5fbdf26b2965eae5 100644 (file)
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -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;

diff --git a/sapi/pi3web/pi3web_sapi.c b/sapi/pi3web/pi3web_sapi.c
index 64eb2a6c99526e3b59dcec3d9508e8cfe22aae3a..b9076f17d86376743d0c5417510c3891ea7f1e26 100644 (file)
--- a/sapi/pi3web/pi3web_sapi.c
+++ b/sapi/pi3web/pi3web_sapi.c
@@ -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
                                        {