com php-src: C89 fixes: sapi/phpdbg/phpdbg_info.c sapi/ph pdbg/phpdbg_prompt.c

From: Date: Tue, 16 Dec 2014 11:20:59 +0000
Subject: com php-src: C89 fixes: sapi/phpdbg/phpdbg_info.c sapi/ph pdbg/phpdbg_prompt.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-83738@lists.php.net to get a copy of this message
Commit: 673003757f5c82eb79bdabb913069f1b7b2ad982 Author: Anatol Belski <ab@php.net> Tue, 16 Dec 2014 12:20:29 +0100 Parents: bee4a28433563b9c216ab48502c82771ae69b72d Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=673003757f5c82eb79bdabb913069f1b7b2ad982 Log: C89 fixes Changed paths: M sapi/phpdbg/phpdbg_info.c M sapi/phpdbg/phpdbg_prompt.c Diff: diff --git a/sapi/phpdbg/phpdbg_info.c b/sapi/phpdbg/phpdbg_info.c index 01633e4..7963ff3 100644 --- a/sapi/phpdbg/phpdbg_info.c +++ b/sapi/phpdbg/phpdbg_info.c @@ -386,8 +386,9 @@ PHPDBG_INFO(classes) /* {{{ */ phpdbg_print_class_name(ce TSRMLS_CC); if (ce->parent) { + zend_class_entry *pce; phpdbg_xml("<parents %r>"); - zend_class_entry *pce = ce->parent; + pce = ce->parent; do { phpdbg_out("|-------- "); phpdbg_print_class_name(pce TSRMLS_CC); diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c index f567a42..0ab5b4d 100644 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@ -698,10 +698,11 @@ PHPDBG_COMMAND(ev) /* {{{ */ zend_execute_data *original_execute_data = EG(current_execute_data); zend_class_entry *original_scope = EG(scope); zend_vm_stack original_stack = EG(vm_stack); - original_stack->top = EG(vm_stack_top); PHPDBG_OUTPUT_BACKUP(); + original_stack->top = EG(vm_stack_top); + 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 TSRMLS_CC); @@ -1072,7 +1073,7 @@ PHPDBG_COMMAND(dl) /* {{{ */ PHPDBG_COMMAND(source) /* {{{ */ { - struct stat sb; + zend_stat_t sb; if (VCWD_STAT(param->str, &sb) != -1) { phpdbg_try_file_init(param->str, param->len, 0 TSRMLS_CC);

« previous php.cvs (#83738) next »