tony2001                                 Tue, 08 Jun 2010 13:27:30 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=300276

Log:
fix bug #50101 (name clash between global and local variable)

Bug: http://bugs.php.net/50101 (Open) [PATCH] - Avoid name clash between global 
and local variable
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/NEWS
    U   php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c
    U   php/php-src/trunk/TSRM/tsrm_virtual_cwd.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2010-06-08 13:05:49 UTC (rev 300275)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-06-08 13:27:30 UTC (rev 300276)
@@ -171,6 +171,8 @@
 - Fixed bug #50383 (Exceptions thrown in __call / __callStatic do not include
   file and line in trace). (Felipe)
 - Fixed bug #50358 (Compile failure compiling ext/phar/util.lo). (Felipe)
+- Fixed bug #50101 (name clash between global and local variable).
+  (patch by yoarvi at gmail dot com)
 - Fixed bug #49893 (Crash while creating an instance of 
Zend_Mail_Storage_Pop3).
   (Dmitry)
 - Fixed bug #49819 (STDOUT losing data with posix_isatty()). (Mike)

Modified: php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c
===================================================================
--- php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c        2010-06-08 
13:05:49 UTC (rev 300275)
+++ php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c        2010-06-08 
13:27:30 UTC (rev 300276)
@@ -298,19 +298,19 @@
 }
 /* }}} */

-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);
 }
 /* }}} */

Modified: php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
===================================================================
--- php/php-src/trunk/TSRM/tsrm_virtual_cwd.c   2010-06-08 13:05:49 UTC (rev 
300275)
+++ php/php-src/trunk/TSRM/tsrm_virtual_cwd.c   2010-06-08 13:27:30 UTC (rev 
300276)
@@ -298,19 +298,19 @@
 }
 /* }}} */

-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);
 }
 /* }}} */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to