com php-src: Use appropriate macros: Zend/zend.c Zend/zend_ex ecute.c Zend/zend_execute_API.c

From: Date: Fri, 25 Apr 2014 07:54:10 +0000
Subject: com php-src: Use appropriate macros: Zend/zend.c Zend/zend_ex ecute.c Zend/zend_execute_API.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-77282@lists.php.net to get a copy of this message
Commit: 4e7cbf3f5842abe6688c11ce3cc11d2eabf0695f Author: Dmitry Stogov <dmitry@zend.com> Fri, 25 Apr 2014 11:54:10 +0400 Parents: 2c39cf670c3dacad8ceb468dc2765ee6756676f2 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4e7cbf3f5842abe6688c11ce3cc11d2eabf0695f Log: Use appropriate macros Changed paths: M Zend/zend.c M Zend/zend_execute.c M Zend/zend_execute_API.c Diff: diff --git a/Zend/zend.c b/Zend/zend.c index dc0ae27...465446d 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -429,7 +429,7 @@ ZEND_API void zend_print_zval_r_ex(zend_write_func_t write_func, zval *expr, int properties->u.v.nApplyCount--; if (is_temp) { zend_hash_destroy(properties); - efree(properties); + FREE_HASHTABLE(properties); } break; } diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 2dc3c22..b5f9df5 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1494,7 +1494,7 @@ void zend_clean_and_cache_symbol_table(zend_array *symbol_table TSRMLS_DC) /* {{ { if (EG(symtable_cache_ptr) >= EG(symtable_cache_limit)) { zend_hash_destroy(&symbol_table->ht); - efree(symbol_table); + FREE_HASHTABLE(symbol_table); } else { /* clean before putting into the cache, since clean could call dtors, which could use cached hash */ diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 3ad4a8c..621ad66 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -359,7 +359,7 @@ void shutdown_executor(TSRMLS_D) /* {{{ */ while (EG(symtable_cache_ptr)>=EG(symtable_cache)) { zend_hash_destroy(&(*EG(symtable_cache_ptr))->ht); - efree(*EG(symtable_cache_ptr)); + FREE_HASHTABLE(*EG(symtable_cache_ptr)); EG(symtable_cache_ptr)--; } } zend_end_try();

« previous php.cvs (#77282) next »