archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed warnings and folder marks mess

Browse source
This commit is contained in:
Xinchen Hui 2015-04-21 21:53:12 +08:00
parent 8362aebdbf
commit e121ccaaad
2 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sapi/phpdbg/phpdbg_bp.c
View file

@ -41,10 +41,11 @@ static inline phpdbg_breakbase_t *phpdbg_find_conditional_breakpoint(zend_execut
* A break point must always set the correct id and type
* A set breakpoint function must always map new points
*/
static inline void _phpdbg_break_mapping(int id, HashTable *table)
static inline void _phpdbg_break_mapping(int id, HashTable *table) /* {{{ */
{
zend_hash_index_update_ptr(&PHPDBG_G(bp)[PHPDBG_BREAK_MAP], id, table);
}
/* }}} */
#define PHPDBG_BREAK_MAPPING(id, table) _phpdbg_break_mapping(id, table)
#define PHPDBG_BREAK_UNMAPPING(id) \
@ -108,6 +109,7 @@ PHPDBG_API void phpdbg_export_breakpoints(FILE *handle) /* {{{ */
phpdbg_export_breakpoints_to_string(&string);
fputs(string, handle);
}
/* }}} */
PHPDBG_API void phpdbg_export_breakpoints_to_string(char **str) /* {{{ */
{
@ -622,6 +624,7 @@ PHPDBG_API void phpdbg_set_breakpoint_method_opline(const char *class, const cha
zend_hash_index_update_mem(method_table, opline, &new_break, sizeof(phpdbg_breakopline_t));
}
/* }}} */
PHPDBG_API void phpdbg_set_breakpoint_function_opline(const char *function, zend_ulong opline) /* {{{ */
{
@ -667,6 +670,7 @@ PHPDBG_API void phpdbg_set_breakpoint_function_opline(const char *function, zend
zend_hash_index_update_mem(func_table, opline, &new_break, sizeof(phpdbg_breakopline_t));
}
/* }}} */
PHPDBG_API void phpdbg_set_breakpoint_file_opline(const char *file, zend_ulong opline) /* {{{ */
{
@ -712,6 +716,7 @@ PHPDBG_API void phpdbg_set_breakpoint_file_opline(const char *file, zend_ulong o
zend_hash_index_update_mem(file_table, opline, &new_break, sizeof(phpdbg_breakopline_t));
}
/* }}} */
PHPDBG_API void phpdbg_set_breakpoint_opcode(const char *name, size_t name_len) /* {{{ */
{

26
sapi/phpdbg/phpdbg_prompt.c
View file

@ -377,6 +377,7 @@ void phpdbg_init(char *init_file, size_t init_file_len, zend_bool use_default) /
phpdbg_try_file_init(init_file, init_file_len, 1);
}
}
/* }}} */
PHPDBG_COMMAND(exec) /* {{{ */
{
@ -474,7 +475,7 @@ PHPDBG_COMMAND(continue) /* {{{ */
return PHPDBG_NEXT;
} /* }}} */
int phpdbg_skip_line_helper() {
int phpdbg_skip_line_helper() /* {{{ */ {
PHPDBG_G(flags) |= PHPDBG_IN_UNTIL;
PHPDBG_G(seek_ex) = EG(current_execute_data);
{
@ -496,6 +497,7 @@ int phpdbg_skip_line_helper() {
return PHPDBG_UNTIL;
}
/* }}} */
PHPDBG_COMMAND(until) /* {{{ */
{
@ -518,7 +520,7 @@ PHPDBG_COMMAND(next) /* {{{ */
return phpdbg_skip_line_helper();
} /* }}} */
static void phpdbg_seek_to_end(void) {
static void phpdbg_seek_to_end(void) /* {{{ */ {
const zend_op *opline = EG(current_execute_data)->opline;
const zend_op_array *op_array = &EG(current_execute_data)->func->op_array - 1;
@ -534,6 +536,7 @@ static void phpdbg_seek_to_end(void) {
}
}
}
/* }}} */
PHPDBG_COMMAND(finish) /* {{{ */
{
@ -572,15 +575,17 @@ PHPDBG_COMMAND(frame) /* {{{ */
return SUCCESS;
} /* }}} */
static inline void phpdbg_handle_exception(void) /* }}} */
static inline void phpdbg_handle_exception(void) /* {{{ */
{
zend_fcall_info fci;
zval trace;
zend_object *ex = EG(exception);
/* get filename and linenumber before unsetting exception */
/* not really useful??? see blow
const char *filename = zend_get_executed_filename();
uint32_t lineno = zend_get_executed_lineno();
*/
EG(exception) = NULL;
@ -716,7 +721,7 @@ out:
return SUCCESS;
} /* }}} */
int phpdbg_output_ev_variable(char *name, size_t len, char *keyname, size_t keylen, HashTable *parent, zval *zv) {
int phpdbg_output_ev_variable(char *name, size_t len, char *keyname, size_t keylen, HashTable *parent, zval *zv) /* {{{ */ {
phpdbg_notice("eval", "variable=\"%.*s\"", "Printing variable %.*s", (int) len, name);
phpdbg_xml("<eval %r>");
zend_print_zval_r(zv, 0);
@ -728,6 +733,7 @@ int phpdbg_output_ev_variable(char *name, size_t len, char *keyname, size_t keyl
return SUCCESS;
}
/* }}} */
PHPDBG_COMMAND(ev) /* {{{ */
{
@ -931,17 +937,19 @@ PHPDBG_COMMAND(sh) /* {{{ */
return SUCCESS;
} /* }}} */
static int add_module_info(zend_module_entry *module) {
static int add_module_info(zend_module_entry *module) /* {{{ */ {
phpdbg_write("module", "name=\"%s\"", "%s\n", module->name);
return 0;
}
/* }}} */
static int add_zendext_info(zend_extension *ext) {
static int add_zendext_info(zend_extension *ext) /* {{{ */ {
phpdbg_write("extension", "name=\"%s\"", "%s\n", ext->name);
return 0;
}
/* }}} */
PHPDBG_API const char *phpdbg_load_module_or_extension(char **path, char **name) {
PHPDBG_API const char *phpdbg_load_module_or_extension(char **path, char **name) /* {{{ */ {
DL_HANDLE handle;
char *extension_dir;
@ -1080,6 +1088,7 @@ quit:
DL_UNLOAD(handle);
return NULL;
}
/* }}} */
PHPDBG_COMMAND(dl) /* {{{ */
{
@ -1530,7 +1539,7 @@ next:
} /* }}} */
/* only if *not* interactive and while executing */
void phpdbg_force_interruption(void) {
void phpdbg_force_interruption(void) /* {{{ */ {
zend_execute_data *data = EG(current_execute_data); /* should be always readable if not NULL */
PHPDBG_G(flags) |= PHPDBG_IN_SIGNAL_HANDLER;
@ -1554,6 +1563,7 @@ next:
zend_bailout();
}
}
/* }}} */
PHPDBG_COMMAND(eol) /* {{{ */
{