diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-02-14 17:48:45 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-02-14 17:48:45 +0400 |
| commit | 17bf59f895b886a3cc279ac91873588129d1a374 (patch) | |
| tree | 8acc55597ed7ea28e407f9e9de23ea3c79024817 /Zend/zend_builtin_functions.c | |
| parent | e85790a4d4badbddf03fb052b75d5f9639d2d0f0 (diff) | |
| download | php-git-17bf59f895b886a3cc279ac91873588129d1a374.tar.gz | |
Use better data structures (incomplete)
Diffstat (limited to 'Zend/zend_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 8139a443f7..c35a102171 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -923,8 +923,7 @@ static void add_class_vars(zend_class_entry *ce, int statics, zval *return_value } /* copy: enforce read only access */ - ZVAL_DUP(&prop_copy, prop); -//??? INIT_PZVAL(prop_copy); + ZVAL_DUP_DEREF(&prop_copy, prop); /* this is necessary to make it able to work with default array * properties, returned to user */ @@ -1938,8 +1937,7 @@ ZEND_FUNCTION(get_defined_constants) add_assoc_zval(return_value, module_names[module_number], &modules[module_number]); } - ZVAL_DUP(&const_val, &val->value); -//??? INIT_PZVAL(const_val); + ZVAL_DUP_DEREF(&const_val, &val->value); add_assoc_zval_ex(&modules[module_number], val->name->val, val->name->len, &const_val); next_constant: @@ -2019,8 +2017,6 @@ ZEND_FUNCTION(debug_print_backtrace) ptr = ptr->prev_execute_data; while (ptr && (limit == 0 || frameno < limit)) { -//??? const char *free_class_name = NULL; - frameno++; class_name = NULL; call_type = NULL; @@ -2149,9 +2145,6 @@ ZEND_FUNCTION(debug_print_backtrace) include_filename = filename; ptr = skip->prev_execute_data; ++indent; -//??? if (free_class_name) { -//??? efree((char*)free_class_name); -//??? } } } |