diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2011-05-19 23:18:55 +0000 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2011-05-19 23:18:55 +0000 |
| commit | cac66ef3769686a98db7bd43c1c87db49d3bdb66 (patch) | |
| tree | 3eb0078e23ce56a5b4ab492f33f7714ace2fb71d | |
| parent | ef2357ce486be9df8ed48dc2efa71fada3696a77 (diff) | |
| download | php-git-cac66ef3769686a98db7bd43c1c87db49d3bdb66.tar.gz | |
Fix CS
| -rw-r--r-- | TSRM/tsrm_virtual_cwd.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c index ca9809b104..1ceaad7b15 100644 --- a/TSRM/tsrm_virtual_cwd.c +++ b/TSRM/tsrm_virtual_cwd.c @@ -619,10 +619,11 @@ CWD_API void realpath_cache_del(const char *path, int path_len TSRMLS_DC) /* {{{ *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 @@ static inline realpath_cache_bucket* realpath_cache_find(const char *path, int p *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) { |