php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-01 13:12:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Fix conflict

Browse Source
This commit is contained in:
Felipe Pena
2013-11-20 11:29:58 -02:00
parent a0b75a24e5
commit febeeea4ba
1 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
phpdbg_prompt.c
View File

@@ -917,7 +917,7 @@ static PHPDBG_COMMAND(list) /* {{{ */
return SUCCESS;
} /* }}} */
int phpdbg_call_register(phpdbg_input_t *input TSRMLS_DC) /* {{{ */
static inline int phpdbg_call_register(phpdbg_input_t *input TSRMLS_DC) /* {{{ */
{
phpdbg_input_t *function = input->argv[0];
@@ -925,17 +925,19 @@ int phpdbg_call_register(phpdbg_input_t *input TSRMLS_DC) /* {{{ */
&PHPDBG_G(registered), function->string, function->length+1)) {
zval fname, *fretval;
zend_fcall_info *fci = ecalloc(1, sizeof(zend_fcall_info));
zend_fcall_info fci;
ZVAL_STRINGL(&fname, function->string, function->length, 1);
fci->size = sizeof(zend_fcall_info);
fci->function_table = &PHPDBG_G(registered);
fci->function_name = &fname;
fci->symbol_table = EG(active_symbol_table);
fci->object_ptr = NULL;
fci->retval_ptr_ptr = &fretval;
fci->no_separation = 1;
memset(&fci, 0, sizeof(zend_fcall_info));
fci.size = sizeof(zend_fcall_info);
fci.function_table = &PHPDBG_G(registered);
fci.function_name = &fname;
fci.symbol_table = EG(active_symbol_table);
fci.object_ptr = NULL;
fci.retval_ptr_ptr = &fretval;
fci.no_separation = 1;
if (input->argc > 1) {
int param;
@@ -954,17 +956,17 @@ int phpdbg_call_register(phpdbg_input_t *input TSRMLS_DC) /* {{{ */
param, param+1, input->argv[param+1]->string);
}
zend_fcall_info_args(fci, &params TSRMLS_CC);
zend_fcall_info_args(&fci, &params TSRMLS_CC);
} else {
fci->params = NULL;
fci->param_count = 0;
fci.params = NULL;
fci.param_count = 0;
}
phpdbg_debug(
"created %d params from %d argvuments",
fci->param_count, input->argc);
fci.param_count, input->argc);
zend_call_function(fci, NULL TSRMLS_CC);
zend_call_function(&fci, NULL TSRMLS_CC);
if (fretval) {
zend_print_zval_r(
@@ -974,12 +976,6 @@ int phpdbg_call_register(phpdbg_input_t *input TSRMLS_DC) /* {{{ */
zval_dtor(&fname);
if (fci->params) {
efree(fci->params);
}
efree(fci);
return SUCCESS;
}