More TSRMLS_FETCH work

diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index a6693418901b1a9c7eeda8b50add96675413f21d..ee2f41acddf00bcd61b86187558d4ad5b7963597 100644 (file)
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -42,7 +42,7 @@
  * If type==3, output will be printed binary, no lines will be saved or returned (passthru)
  *
  */
-int php_Exec(int type, char *cmd, pval *array, pval *return_value)
+int php_Exec(int type, char *cmd, pval *array, pval *return_value TSRMLS_DC)
 {
        FILE *fp;
        char *buf, *tmp=NULL;
@@ -54,7 +54,6 @@ int php_Exec(int type, char *cmd, pval *array, pval *return_value)
 #if PHP_SIGCHILD
        void (*sig_handler)();
 #endif
-       TSRMLS_FETCH();
 
        buf = (char*) emalloc(EXEC_INPUT_BUF);
     if (!buf) {
@@ -248,13 +247,13 @@ PHP_FUNCTION(exec)
        }
        switch (arg_count) {
                case 1:
-                       ret = php_Exec(0, Z_STRVAL_PP(arg1), NULL,return_value);
+                       ret = php_Exec(0, Z_STRVAL_PP(arg1), NULL,return_value TSRMLS_CC);
                        break;
                case 2:
-                       ret = php_Exec(2, Z_STRVAL_PP(arg1),*arg2,return_value);
+                       ret = php_Exec(2, Z_STRVAL_PP(arg1),*arg2,return_value TSRMLS_CC);
                        break;
                case 3:
-                       ret = php_Exec(2,Z_STRVAL_PP(arg1),*arg2,return_value);
+                       ret = php_Exec(2,Z_STRVAL_PP(arg1),*arg2,return_value TSRMLS_CC);
                        Z_TYPE_PP(arg3) = IS_LONG;
                        Z_LVAL_PP(arg3)=ret;
                        break;
@@ -276,10 +275,10 @@ PHP_FUNCTION(system)
        }
        switch (arg_count) {
                case 1:
-                       ret = php_Exec(1, Z_STRVAL_PP(arg1), NULL,return_value);
+                       ret = php_Exec(1, Z_STRVAL_PP(arg1), NULL,return_value TSRMLS_CC);
                        break;
                case 2:
-                       ret = php_Exec(1, Z_STRVAL_PP(arg1), NULL,return_value);
+                       ret = php_Exec(1, Z_STRVAL_PP(arg1), NULL,return_value TSRMLS_CC);
                        Z_TYPE_PP(arg2) = IS_LONG;
                        Z_LVAL_PP(arg2)=ret;
                        break;
@@ -300,10 +299,10 @@ PHP_FUNCTION(passthru)
        }
        switch (arg_count) {
                case 1:
-                       ret = php_Exec(3, Z_STRVAL_PP(arg1), NULL,return_value);
+                       ret = php_Exec(3, Z_STRVAL_PP(arg1), NULL, return_value TSRMLS_CC);
                        break;
                case 2:
-                       ret = php_Exec(3, Z_STRVAL_PP(arg1), NULL,return_value);
+                       ret = php_Exec(3, Z_STRVAL_PP(arg1), NULL, return_value TSRMLS_CC);
                        Z_TYPE_PP(arg2) = IS_LONG;
                        Z_LVAL_PP(arg2)=ret;
                        break;

diff --git a/ext/standard/exec.h b/ext/standard/exec.h
index c7fb7a5b3125c350e56e00d6416ddabe48a01ec4..ea156283ac63266c8ead6fbdd3558f3d9841b3c6 100644 (file)
--- a/ext/standard/exec.h
+++ b/ext/standard/exec.h
@@ -30,6 +30,6 @@ PHP_FUNCTION(shell_exec);
 
 char *php_escape_shell_cmd(char *);
 char *php_escape_shell_arg(char *);
-int php_Exec(int type, char *cmd, pval *array, pval *return_value);
+int php_Exec(int type, char *cmd, pval *array, pval *return_value TSRMLS_DC);
 
 #endif /* EXEC_H */

diff --git a/ext/standard/info.c b/ext/standard/info.c
index ba84c689a05b901e56b73f11b6633d1d4f650249..84689d1733b1bad783a45dd3570f3b643831f4ad 100644 (file)
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -146,14 +146,13 @@ PHPAPI char *php_get_uname()
 
 /* {{{ php_print_info
  */
-PHPAPI void php_print_info(int flag)
+PHPAPI void php_print_info(int flag TSRMLS_DC)
 {
        char **env,*tmp1,*tmp2;
        char *php_uname;
        int expose_php = INI_INT("expose_php");
        time_t the_time;
        struct tm *ta, tmbuf;
-       TSRMLS_FETCH();
 
        the_time = time(NULL);
        ta = php_localtime_r(&the_time, &tmbuf);
@@ -475,7 +474,7 @@ PHP_FUNCTION(phpinfo)
                        WRONG_PARAM_COUNT;
                        break;
        }
-       php_print_info(flag);
+       php_print_info(flag TSRMLS_CC);
        RETURN_TRUE;
 }
 

diff --git a/ext/standard/info.h b/ext/standard/info.h
index b4666f0fdbfd34b42e698b19111a8c3bba7ded6c..e18fba16b0770f7f9cac767caf9a05594cd0d0f2 100644 (file)
--- a/ext/standard/info.h
+++ b/ext/standard/info.h
@@ -63,7 +63,7 @@ PHP_FUNCTION(zend_logo_guid);
 PHP_FUNCTION(php_egg_logo_guid);
 PHP_FUNCTION(php_sapi_name);
 PHP_FUNCTION(php_uname);
-PHPAPI void php_print_info(int flag);
+PHPAPI void php_print_info(int flag TSRMLS_DC);
 PHPAPI void php_print_style(void);
 PHPAPI void php_info_print_style(void);
 PHPAPI void php_info_print_table_colspan_header(int num_cols, char *header);