rasmus Thu, 19 May 2011 23:18:55 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=311275
Log:
Fix CS
Changed paths:
U php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c
U php/php-src/branches/PHP_5_4/TSRM/tsrm_virtual_cwd.c
U php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
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 2011-05-19
23:09:58 UTC (rev 311274)
+++ php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c 2011-05-19
23:18:55 UTC (rev 311275)
@@ -631,10 +631,11 @@
*bucket = (*bucket)->next;
/* if the pointers match then only subtract the length
of the path */
- if(r->path == r->realpath)
- CWDG(realpath_cache_size) -=
sizeof(realpath_cache_bucket) + r->path_len + 1;
- else
- CWDG(realpath_cache_size) -=
sizeof(realpath_cache_bucket) + r->path_len + 1 + r->realpath_len + 1;
+ if(r->path == r->realpath) {
+ CWDG(realpath_cache_size) -=
sizeof(realpath_cache_bucket) + r->path_len + 1;
+ } else {
+ CWDG(realpath_cache_size) -=
sizeof(realpath_cache_bucket) + r->path_len + 1 + r->realpath_len + 1;
+ }
free(r);
return;
@@ -712,10 +713,11 @@
*bucket = (*bucket)->next;
/* if the pointers match then only subtract the length
of the path */
- if(r->path == r->realpath)
- CWDG(realpath_cache_size) -=
sizeof(realpath_cache_bucket) + r->path_len + 1;
- else
- CWDG(realpath_cache_size) -=
sizeof(realpath_cache_bucket) + r->path_len + 1 + r->realpath_len + 1;
+ if(r->path == r->realpath) {
+ CWDG(realpath_cache_size) -=
sizeof(realpath_cache_bucket) + r->path_len + 1;
+ } else {
+ CWDG(realpath_cache_size) -=
sizeof(realpath_cache_bucket) + r->path_len + 1 + r->realpath_len + 1;
+ }
free(r);
} else if (key == (*bucket)->key && path_len ==
(*bucket)->path_len &&
Modified: php/php-src/branches/PHP_5_4/TSRM/tsrm_virtual_cwd.c
===================================================================
--- php/php-src/branches/PHP_5_4/TSRM/tsrm_virtual_cwd.c 2011-05-19
23:09:58 UTC (rev 311274)
+++ php/php-src/branches/PHP_5_4/TSRM/tsrm_virtual_cwd.c 2011-05-19
23:18:55 UTC (rev 311275)
@@ -619,10 +619,11 @@
*bucket = (*bucket)->next;
/* if the pointers match then only subtract the length
of the path */
- if(r->path == r->realpath)
- CWDG(realpath_cache_size) -=
sizeof(realpath_cache_bucket) + r->path_len + 1;
- else
- CWDG(realpath_cache_size) -=
sizeof(realpath_cache_bucket) + r->path_len + 1 + r->realpath_len + 1;
+ if(r->path == r->realpath) {
+ CWDG(realpath_cache_size) -=
sizeof(realpath_cache_bucket) + r->path_len + 1;
+ } else {
+ CWDG(realpath_cache_size) -=
sizeof(realpath_cache_bucket) + r->path_len + 1 + r->realpath_len + 1;
+ }
free(r);
return;
@@ -700,10 +701,11 @@
*bucket = (*bucket)->next;
/* if the pointers match then only subtract the length
of the path */
- if(r->path == r->realpath)
- CWDG(realpath_cache_size) -=
sizeof(realpath_cache_bucket) + r->path_len + 1;
- else
- CWDG(realpath_cache_size) -=
sizeof(realpath_cache_bucket) + r->path_len + 1 + r->realpath_len + 1;
+ if(r->path == r->realpath) {
+ CWDG(realpath_cache_size) -=
sizeof(realpath_cache_bucket) + r->path_len + 1;
+ } else {
+ CWDG(realpath_cache_size) -=
sizeof(realpath_cache_bucket) + r->path_len + 1 + r->realpath_len + 1;
+ }
free(r);
} else if (key == (*bucket)->key && path_len ==
(*bucket)->path_len &&
Modified: php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
===================================================================
--- php/php-src/trunk/TSRM/tsrm_virtual_cwd.c 2011-05-19 23:09:58 UTC (rev
311274)
+++ php/php-src/trunk/TSRM/tsrm_virtual_cwd.c 2011-05-19 23:18:55 UTC (rev
311275)
@@ -619,10 +619,11 @@
*bucket = (*bucket)->next;
/* if the pointers match then only subtract the length
of the path */
- if(r->path == r->realpath)
- CWDG(realpath_cache_size) -=
sizeof(realpath_cache_bucket) + r->path_len + 1;
- else
- CWDG(realpath_cache_size) -=
sizeof(realpath_cache_bucket) + r->path_len + 1 + r->realpath_len + 1;
+ if(r->path == r->realpath) {
+ CWDG(realpath_cache_size) -=
sizeof(realpath_cache_bucket) + r->path_len + 1;
+ } else {
+ CWDG(realpath_cache_size) -=
sizeof(realpath_cache_bucket) + r->path_len + 1 + r->realpath_len + 1;
+ }
free(r);
return;
@@ -700,11 +701,12 @@
*bucket = (*bucket)->next;
/* if the pointers match then only subtract the length
of the path */
- if(r->path == r->realpath)
- CWDG(realpath_cache_size) -=
sizeof(realpath_cache_bucket) + r->path_len + 1;
- else
- CWDG(realpath_cache_size) -=
sizeof(realpath_cache_bucket) + r->path_len + 1 + r->realpath_len + 1;
-
+ if(r->path == r->realpath) {
+ CWDG(realpath_cache_size) -=
sizeof(realpath_cache_bucket) + r->path_len + 1;
+ } else {
+ CWDG(realpath_cache_size) -=
sizeof(realpath_cache_bucket) + r->path_len + 1 + r->realpath_len + 1;
+ }
+
free(r);
} else if (key == (*bucket)->key && path_len ==
(*bucket)->path_len &&
memcmp(path, (*bucket)->path, path_len)
== 0) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
