diff options
| author | Pierre Joye <pajoye@php.net> | 2010-09-17 10:00:01 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2010-09-17 10:00:01 +0000 |
| commit | b154864cc94209bb2badc0e3685d5d3d0ae3eca0 (patch) | |
| tree | f5f0bdc647a70f81665cae446ed4741456902ec3 /TSRM | |
| parent | 83527d16a323416a354df4ddfbd86fc0efa2967e (diff) | |
| download | php-git-b154864cc94209bb2badc0e3685d5d3d0ae3eca0.tar.gz | |
- drop tsrmls_fetch in popen_ex
Diffstat (limited to 'TSRM')
| -rw-r--r-- | TSRM/tsrm_virtual_cwd.c | 2 | ||||
| -rw-r--r-- | TSRM/tsrm_win32.c | 8 | ||||
| -rw-r--r-- | TSRM/tsrm_win32.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c index d6d32e5d70..5748dfdca5 100644 --- a/TSRM/tsrm_virtual_cwd.c +++ b/TSRM/tsrm_virtual_cwd.c @@ -1764,7 +1764,7 @@ CWD_API DIR *virtual_opendir(const char *pathname TSRMLS_DC) /* {{{ */ #ifdef TSRM_WIN32 CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC) /* {{{ */ { - return popen_ex(command, type, CWDG(cwd).cwd, NULL); + return popen_ex(command, type, CWDG(cwd).cwd, NULL TSRMLS_CC); } /* }}} */ #elif defined(NETWARE) diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c index a1fb12f274..7f07f2920a 100644 --- a/TSRM/tsrm_win32.c +++ b/TSRM/tsrm_win32.c @@ -446,10 +446,12 @@ static HANDLE dupHandle(HANDLE fh, BOOL inherit) { TSRM_API FILE *popen(const char *command, const char *type) { - return popen_ex(command, type, NULL, NULL); + TSRMLS_FETCH(); + + return popen_ex(command, type, NULL, NULL TSRMLS_CC); } -TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env) +TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env TSRMLS_DC) { FILE *stream = NULL; int fno, type_len = strlen(type), read, mode; @@ -467,8 +469,6 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, HANDLE token_user = NULL; BOOL asuser = TRUE; - TSRMLS_FETCH(); - if (!type) { return NULL; } diff --git a/TSRM/tsrm_win32.h b/TSRM/tsrm_win32.h index 394053d6d7..5355297f29 100644 --- a/TSRM/tsrm_win32.h +++ b/TSRM/tsrm_win32.h @@ -95,7 +95,7 @@ char * tsrm_win32_get_path_sid_key(const char *pathname TSRMLS_DC); TSRM_API void tsrm_win32_startup(void); TSRM_API void tsrm_win32_shutdown(void); -TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env); +TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env TSRMLS_DC); TSRM_API FILE *popen(const char *command, const char *type); TSRM_API int pclose(FILE *stream); TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC); |