diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-02-13 22:20:39 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-02-13 22:20:39 +0300 |
| commit | e10e151e9b92313a7085272c85bebf6c82017fce (patch) | |
| tree | 6cac4100536c5e25143c55d1ab6b2f3b3dc81cf9 /sapi/phpdbg/phpdbg_prompt.c | |
| parent | bc630ad6da0c6d7cf2d224dba8972499d5691c6b (diff) | |
| download | php-git-e10e151e9b92313a7085272c85bebf6c82017fce.tar.gz | |
Merged zend_array and HashTable into the single data structure.
Now each HashTable is also zend_array, so it's refcounted and may be a subject for Copy on Write
zend_array_dup() was changed to allocate and return HashTable, instead of taking preallocated HashTable as argument.
Diffstat (limited to 'sapi/phpdbg/phpdbg_prompt.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_prompt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c index cb03b1a287..6e492b7aaa 100644 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@ -599,7 +599,7 @@ PHPDBG_COMMAND(run) /* {{{ */ /* clean up from last execution */ if (ex && ex->symbol_table) { - zend_hash_clean(&ex->symbol_table->ht); + zend_hash_clean(ex->symbol_table); } else { zend_rebuild_symbol_table(); } @@ -705,7 +705,7 @@ PHPDBG_COMMAND(ev) /* {{{ */ if (PHPDBG_G(flags) & PHPDBG_IN_SIGNAL_HANDLER) { phpdbg_try_access { - phpdbg_parse_variable(param->str, param->len, &EG(symbol_table).ht, 0, phpdbg_output_ev_variable, 0); + phpdbg_parse_variable(param->str, param->len, &EG(symbol_table), 0, phpdbg_output_ev_variable, 0); } phpdbg_catch_access { phpdbg_error("signalsegv", "", "Could not fetch data, invalid data source"); } phpdbg_end_try_access(); |