diff options
| author | Zeev Suraski <zeev@php.net> | 2001-08-05 01:34:40 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-08-05 01:34:40 +0000 |
| commit | 1f3faae3523071c45fbe074c51804a43c05aa55b (patch) | |
| tree | f8b1e9530eadcd79d0533ecabbd7a6841bcca203 /TSRM/tsrm_win32.c | |
| parent | 2361160cc5264bcb2ff5a71c06d1e6744916b0cf (diff) | |
| download | php-git-1f3faae3523071c45fbe074c51804a43c05aa55b.tar.gz | |
Nukre most TSRMLS_FETCH()'s in TSRM
Diffstat (limited to 'TSRM/tsrm_win32.c')
| -rw-r--r-- | TSRM/tsrm_win32.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c index f8d2b7d741..5dfc2d60f8 100644 --- a/TSRM/tsrm_win32.c +++ b/TSRM/tsrm_win32.c @@ -67,11 +67,10 @@ TSRM_API void tsrm_win32_shutdown(void) #endif } -static ProcessPair* process_get(FILE *stream) +static ProcessPair* process_get(FILE *stream TSRMLS_DC) { ProcessPair* ptr; ProcessPair* newptr; - TSRMLS_FETCH(); for (ptr = TWG(process); ptr < (TWG(process) + TWG(process_size)); ptr++) { if (ptr->stream == stream) { @@ -102,7 +101,7 @@ static HANDLE dupHandle(HANDLE fh, BOOL inherit) { return copy; } -TSRM_API FILE* popen(const char *command, const char *type) +TSRM_API FILE *popen(const char *command, const char *type) { FILE *stream = NULL; int fno, str_len = strlen(type), read, mode; @@ -151,7 +150,7 @@ TSRM_API FILE* popen(const char *command, const char *type) free(cmd); CloseHandle(process.hThread); - proc = process_get(NULL); + proc = process_get(NULL TSRMLS_CC); if (read) { fno = _open_osfhandle((long)in, _O_RDONLY | mode); @@ -167,12 +166,13 @@ TSRM_API FILE* popen(const char *command, const char *type) return stream; } -TSRM_API int pclose(FILE* stream) +TSRM_API int pclose(FILE *stream) { DWORD termstat = 0; ProcessPair* process; + TSRMLS_FETCH(); - if ((process = process_get(stream)) == NULL) { + if ((process = process_get(stream TSRMLS_CC)) == NULL) { return 0; } |