diff options
| author | Antony Dovgal <tony2001@php.net> | 2010-06-08 13:27:30 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2010-06-08 13:27:30 +0000 |
| commit | 9badd4f0fb03a9ca22775cf80f115a7cb617453c (patch) | |
| tree | e6437dd8549a008761abde4f5b4f99fc1948e490 /TSRM | |
| parent | 6b1d256af52e87054742a9d1fac9d686d3aa1fb3 (diff) | |
| download | php-git-9badd4f0fb03a9ca22775cf80f115a7cb617453c.tar.gz | |
fix bug #50101 (name clash between global and local variable)
Diffstat (limited to 'TSRM')
| -rw-r--r-- | TSRM/tsrm_virtual_cwd.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c index 3ccc729fc6..d51e01aa3e 100644 --- a/TSRM/tsrm_virtual_cwd.c +++ b/TSRM/tsrm_virtual_cwd.c @@ -298,19 +298,19 @@ static int php_is_file_ok(const cwd_state *state) /* {{{ */ } /* }}} */ -static void cwd_globals_ctor(virtual_cwd_globals *cwd_globals TSRMLS_DC) /* {{{ */ +static void cwd_globals_ctor(virtual_cwd_globals *cwd_g TSRMLS_DC) /* {{{ */ { - CWD_STATE_COPY(&cwd_globals->cwd, &main_cwd_state); - cwd_globals->realpath_cache_size = 0; - cwd_globals->realpath_cache_size_limit = REALPATH_CACHE_SIZE; - cwd_globals->realpath_cache_ttl = REALPATH_CACHE_TTL; - memset(cwd_globals->realpath_cache, 0, sizeof(cwd_globals->realpath_cache)); + CWD_STATE_COPY(&cwd_g->cwd, &main_cwd_state); + cwd_g->realpath_cache_size = 0; + cwd_g->realpath_cache_size_limit = REALPATH_CACHE_SIZE; + cwd_g->realpath_cache_ttl = REALPATH_CACHE_TTL; + memset(cwd_g->realpath_cache, 0, sizeof(cwd_g->realpath_cache)); } /* }}} */ -static void cwd_globals_dtor(virtual_cwd_globals *cwd_globals TSRMLS_DC) /* {{{ */ +static void cwd_globals_dtor(virtual_cwd_globals *cwd_g TSRMLS_DC) /* {{{ */ { - CWD_STATE_FREE(&cwd_globals->cwd); + CWD_STATE_FREE(&cwd_g->cwd); realpath_cache_clean(TSRMLS_C); } /* }}} */ |