mirror of
https://github.com/php/php-src.git
synced 2025-08-16 14:08:47 +02:00
fix bug #50101 (name clash between global and local variable)
This commit is contained in:
parent
7b27887091
commit
dd73c48d57
1 changed files with 8 additions and 8 deletions
|
@ -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_STATE_COPY(&cwd_g->cwd, &main_cwd_state);
|
||||||
cwd_globals->realpath_cache_size = 0;
|
cwd_g->realpath_cache_size = 0;
|
||||||
cwd_globals->realpath_cache_size_limit = REALPATH_CACHE_SIZE;
|
cwd_g->realpath_cache_size_limit = REALPATH_CACHE_SIZE;
|
||||||
cwd_globals->realpath_cache_ttl = REALPATH_CACHE_TTL;
|
cwd_g->realpath_cache_ttl = REALPATH_CACHE_TTL;
|
||||||
memset(cwd_globals->realpath_cache, 0, sizeof(cwd_globals->realpath_cache));
|
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);
|
realpath_cache_clean(TSRMLS_C);
|
||||||
}
|
}
|
||||||
/* }}} */
|
/* }}} */
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue