mirror of
https://github.com/php/php-src.git
synced 2026-03-29 19:52:20 +02:00
clean not destroy included files
remove argc, argv from phpdbg_interactive, unused
This commit is contained in:
2
phpdbg.c
2
phpdbg.c
@@ -355,7 +355,7 @@ int main(int argc, char *argv[]) /* {{{ */
|
||||
|
||||
do {
|
||||
zend_try {
|
||||
phpdbg_interactive(argc, argv TSRMLS_CC);
|
||||
phpdbg_interactive(TSRMLS_C);
|
||||
} zend_catch {
|
||||
|
||||
} zend_end_try();
|
||||
|
||||
@@ -270,7 +270,7 @@ static PHPDBG_COMMAND(clean) /* {{{ */
|
||||
zend_hash_reverse_apply(EG(function_table), (apply_func_t) clean_non_persistent_function_full TSRMLS_CC);
|
||||
zend_hash_reverse_apply(EG(class_table), (apply_func_t) clean_non_persistent_class_full TSRMLS_CC);
|
||||
zend_hash_reverse_apply(EG(zend_constants), (apply_func_t) clean_non_persistent_constant_full TSRMLS_CC);
|
||||
zend_hash_destroy(&EG(included_files));
|
||||
zend_hash_clean(&EG(included_files));
|
||||
return SUCCESS;
|
||||
} /* }}} */
|
||||
|
||||
@@ -347,7 +347,7 @@ int phpdbg_do_cmd(const phpdbg_command_t *command, char *cmd_line, size_t cmd_le
|
||||
return FAILURE;
|
||||
} /* }}} */
|
||||
|
||||
int phpdbg_interactive(int argc, char **argv TSRMLS_DC) /* {{{ */
|
||||
int phpdbg_interactive(TSRMLS_D) /* {{{ */
|
||||
{
|
||||
char cmd[PHPDBG_MAX_CMD];
|
||||
|
||||
@@ -417,7 +417,7 @@ zend_vm_enter:
|
||||
|
||||
if (PHPDBG_G(has_file_bp)
|
||||
&& phpdbg_find_breakpoint_file(execute_data->op_array TSRMLS_CC) == SUCCESS) {
|
||||
while (phpdbg_interactive(0, NULL TSRMLS_CC) != PHPDBG_NEXT) {
|
||||
while (phpdbg_interactive(TSRMLS_C) != PHPDBG_NEXT) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
@@ -429,7 +429,7 @@ zend_vm_enter:
|
||||
|| previous->opline->opcode == ZEND_DO_FCALL_BY_NAME) {
|
||||
if (phpdbg_find_breakpoint_symbol(
|
||||
previous->function_state.function TSRMLS_CC) == SUCCESS) {
|
||||
while (phpdbg_interactive(0, NULL TSRMLS_CC) != PHPDBG_NEXT) {
|
||||
while (phpdbg_interactive(TSRMLS_C) != PHPDBG_NEXT) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
@@ -443,7 +443,7 @@ zend_vm_enter:
|
||||
execute_data TSRMLS_CC);
|
||||
|
||||
if (PHPDBG_G(stepping)) {
|
||||
while (phpdbg_interactive(0, NULL TSRMLS_CC) != PHPDBG_NEXT) {
|
||||
while (phpdbg_interactive(TSRMLS_C) != PHPDBG_NEXT) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -58,7 +58,7 @@ int phpdbg_do_cmd(const phpdbg_command_t *command, char *cmd_line, size_t cmd_le
|
||||
#define PHPDBG_COMMAND(name) \
|
||||
int phpdbg_do_##name(const char *expr, size_t expr_len TSRMLS_DC)
|
||||
|
||||
int phpdbg_interactive(int argc, char **argv TSRMLS_DC);
|
||||
int phpdbg_interactive(TSRMLS_D);
|
||||
void phpdbg_execute_ex(zend_execute_data *execute_data TSRMLS_DC);
|
||||
|
||||
#endif /* PHPDBG_PROMPT_H */
|
||||
|
||||
Reference in New Issue
Block a user