cvs: php4 /ext/standard exec.c exec.h info.c info.h

zeev Mon Jul 30 05:16:47 2001 EDT Modified files: /php4/ext/standard exec.c exec.h info.c info.h Log: More TSRMLS_FETCH work Index: php4/ext/standard/exec.c diff -u php4/ext/standard/exec.c:1.59 php4/ext/standard/exec.c:1.60 --- php4/ext/standard/exec.c:1.59 Mon Jul 30 01:36:14 2001 +++ php4/ext/standard/exec.c Mon Jul 30 05:16:44 2001 @@ -15,7 +15,7 @@ | Author: Rasmus Lerdorf | +----------------------------------------------------------------------+ */ -/* $Id: exec.c,v 1.59 2001/07/30 05:36:14 zeev Exp $ */ +/* $Id: exec.c,v 1.60 2001/07/30 09:16:44 zeev Exp $ */ #include <stdio.h> #include "php.h" @@ -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 @@ #if PHP_SIGCHILD void (*sig_handler)(); #endif - TSRMLS_FETCH(); buf = (char*) emalloc(EXEC_INPUT_BUF); if (!buf) { @@ -248,13 +247,13 @@ } 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 @@ } 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 @@ } 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; Index: php4/ext/standard/exec.h diff -u php4/ext/standard/exec.h:1.9 php4/ext/standard/exec.h:1.10 --- php4/ext/standard/exec.h:1.9 Mon Jul 9 13:02:50 2001 +++ php4/ext/standard/exec.h Mon Jul 30 05:16:44 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: exec.h,v 1.9 2001/07/09 17:02:50 derick Exp $ */ +/* $Id: exec.h,v 1.10 2001/07/30 09:16:44 zeev Exp $ */ #ifndef EXEC_H #define EXEC_H @@ -30,6 +30,6 @@ 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 */ Index: php4/ext/standard/info.c diff -u php4/ext/standard/info.c:1.145 php4/ext/standard/info.c:1.146 --- php4/ext/standard/info.c:1.145 Mon Jul 30 02:18:06 2001 +++ php4/ext/standard/info.c Mon Jul 30 05:16:44 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: info.c,v 1.145 2001/07/30 06:18:06 zeev Exp $ */ +/* $Id: info.c,v 1.146 2001/07/30 09:16:44 zeev Exp $ */ #include "php.h" #include "php_ini.h" @@ -146,14 +146,13 @@ /* {{{ 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 @@ WRONG_PARAM_COUNT; break; } - php_print_info(flag); + php_print_info(flag TSRMLS_CC); RETURN_TRUE; } Index: php4/ext/standard/info.h diff -u php4/ext/standard/info.h:1.23 php4/ext/standard/info.h:1.24 --- php4/ext/standard/info.h:1.23 Tue Jun 19 11:21:28 2001 +++ php4/ext/standard/info.h Mon Jul 30 05:16:46 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: info.h,v 1.23 2001/06/19 15:21:28 sbergmann Exp $ */ +/* $Id: info.h,v 1.24 2001/07/30 09:16:46 zeev Exp $ */ #ifndef INFO_H #define INFO_H @@ -63,7 +63,7 @@ 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);