com php-src: Merge remote-tracking branch 'origin/master' into native-tls: sapi/phpdbg/phpdbg.h sapi/phpdbg/phpdbg_info.c sapi/phpdb g/phpdbg_prompt.c

From: Date: Tue, 16 Dec 2014 11:22:27 +0000
Subject: com php-src: Merge remote-tracking branch 'origin/master' into native-tls: sapi/phpdbg/phpdbg.h sapi/phpdbg/phpdbg_info.c sapi/phpdb g/phpdbg_prompt.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-83741@lists.php.net to get a copy of this message
Commit: 9d70df24f8a35e7706d629151f43fc0757eb5f58 Author: Anatol Belski <ab@php.net> Tue, 16 Dec 2014 12:22:27 +0100 Parents: 24f0d2ed54dbc4d059978d45a8157adaa812ca0c 673003757f5c82eb79bdabb913069f1b7b2ad982 Branches: native-tls Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9d70df24f8a35e7706d629151f43fc0757eb5f58 Log: Merge remote-tracking branch 'origin/master' into native-tls * origin/master: C89 fixes use portable struct stat fixed macro va args expansion for vs Changed paths: MM sapi/phpdbg/phpdbg.h MM sapi/phpdbg/phpdbg_info.c MM sapi/phpdbg/phpdbg_prompt.c Diff: diff --cc sapi/phpdbg/phpdbg_info.c index a148a84,7963ff3..2c52b45 --- a/sapi/phpdbg/phpdbg_info.c +++ b/sapi/phpdbg/phpdbg_info.c @@@ -383,14 -383,15 +383,15 @@@ PHPDBG_INFO(classes) /* {{{ * /* once added, assume that classes are stable... until shutdown. */ ZEND_HASH_FOREACH_PTR(&classes, ce) { - phpdbg_print_class_name(ce TSRMLS_CC); + phpdbg_print_class_name(ce); 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); + phpdbg_print_class_name(pce); } while ((pce = pce->parent)); phpdbg_xml("</parents>"); } diff --cc sapi/phpdbg/phpdbg_prompt.c index 6de08e0,0ab5b4d..b490499 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@@ -304,9 -304,9 +304,9 @@@ void phpdbg_string_init(char *buffer) } } -void phpdbg_try_file_init(char *init_file, size_t init_file_len, zend_bool free_init TSRMLS_DC) /* {{{ */ +void phpdbg_try_file_init(char *init_file, size_t init_file_len, zend_bool free_init) /* {{{ */ { - struct stat sb; + zend_stat_t sb; if (init_file && VCWD_STAT(init_file, &sb) != -1) { FILE *fp = fopen(init_file, "r"); @@@ -701,10 -701,11 +701,11 @@@ PHPDBG_COMMAND(ev) /* {{{ * 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); + phpdbg_parse_variable(param->str, param->len, &EG(symbol_table).ht, 0, phpdbg_output_ev_variable, 0); } phpdbg_catch_access { phpdbg_error("signalsegv", "", "Could not fetch data, invalid data source"); } phpdbg_end_try_access(); @@@ -1072,10 -1073,10 +1073,10 @@@ 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); + phpdbg_try_file_init(param->str, param->len, 0); } else { phpdbg_error("source", "type=\"notfound\" file=\"%s\"", "Failed to stat %s, file does not exist", param->str); }

« previous php.cvs (#83741) next »