diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-02-10 17:49:21 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-02-10 17:49:21 +0400 |
| commit | 2161103fc34946a1dcb10ddd50b9db197f89c049 (patch) | |
| tree | 98c04bbc761bea06a81645b7abf65e1e604364c4 /Zend/zend_API.h | |
| parent | 00244baba8f4e90861075ac9b73adea46bb21aaf (diff) | |
| download | php-git-2161103fc34946a1dcb10ddd50b9db197f89c049.tar.gz | |
Use better data structures (incomplete)
Diffstat (limited to 'Zend/zend_API.h')
| -rw-r--r-- | Zend/zend_API.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Zend/zend_API.h b/Zend/zend_API.h index 37c112cd9c..0eadf7548b 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -673,30 +673,30 @@ END_EXTERN_C() { \ char *_name = (name); \ \ - ZEND_SET_SYMBOL_WITH_LENGTH(symtable, _name, strlen(_name)+1, var, 1, 0); \ + ZEND_SET_SYMBOL_WITH_LENGTH(symtable, _name, strlen(_name), var, 1, 0); \ } #define ZEND_SET_SYMBOL_WITH_LENGTH(symtable, name, name_length, var, _refcount, _is_ref) \ { \ - zval **orig_var; \ + zval *orig_var; \ \ - if (zend_hash_find(symtable, (name), (name_length), (void **) &orig_var)==SUCCESS \ - && Z_ISREF_PP(orig_var)) { \ - Z_SET_REFCOUNT_P(var, Z_REFCOUNT_PP(orig_var)); \ - Z_SET_ISREF_P(var); \ + if ((orig_var = zend_hash_str_find(symtable, (name), (name_length))) != NULL \ + && Z_ISREF_P(orig_var)) { \ + Z_SET_REFCOUNT_P(var, Z_REFCOUNT_P(orig_var)); \ + /*???Z_SET_ISREF_P(var);*/ \ \ if (_refcount) { \ Z_SET_REFCOUNT_P(var, Z_REFCOUNT_P(var) + _refcount - 1); \ } \ - zval_dtor(*orig_var); \ - **orig_var = *(var); \ - FREE_ZVAL(var); \ + zval_dtor(orig_var); \ + ZVAL_COPY_VALUE(orig_var, var); \ + /*???FREE_ZVAL(var);*/ \ } else { \ - Z_SET_ISREF_TO_P(var, _is_ref); \ + /*???Z_SET_ISREF_TO_P(var, _is_ref);*/ \ if (_refcount) { \ Z_SET_REFCOUNT_P(var, _refcount); \ } \ - zend_hash_update(symtable, (name), (name_length), &(var), sizeof(zval *), NULL); \ + zend_hash_str_update(symtable, (name), (name_length), var); \ } \ } |