From ebdfef807a39e1c6156c85fcfccc72f1fa69aa8e Mon Sep 17 00:00:00 2001 From: Terry Ellison Date: Wed, 5 Feb 2014 00:04:21 +0000 Subject: Update help content and refactor new routine in php_help.c * I've added more content to the help to expand desciption for new-to-phpdbg developers. * After a code review of the new routines that I've added to the help module, I've decided that the implementation was unnecessarily convolved and that Keep-It-Simple-Stupid would be more understandable, maintainable and have no material performance hit. --- phpdbg_bp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpdbg_bp.c') diff --git a/phpdbg_bp.c b/phpdbg_bp.c index 511d1db57d..1e85f039a5 100644 --- a/phpdbg_bp.c +++ b/phpdbg_bp.c @@ -324,9 +324,9 @@ PHPDBG_API void phpdbg_set_breakpoint_method(const char *class_name, const char PHPDBG_BREAK_MAPPING(new_break.id, class_table); } else { phpdbg_notice("Breakpoint exists at %s::%s", class_name, func_name); - } + } - efree(lcname); + efree(lcname); } /* }}} */ PHPDBG_API void phpdbg_set_breakpoint_opline(zend_ulong opline TSRMLS_DC) /* {{{ */ @@ -992,7 +992,7 @@ static inline phpdbg_breakbase_t *phpdbg_find_conditional_breakpoint(zend_execut for (zend_hash_internal_pointer_reset_ex(&PHPDBG_G(bp)[PHPDBG_BREAK_COND], &position); zend_hash_get_current_data_ex(&PHPDBG_G(bp)[PHPDBG_BREAK_COND], (void*)&bp, &position) == SUCCESS; - zend_hash_move_forward_ex(&PHPDBG_G(bp)[PHPDBG_BREAK_COND], &position)) { + zend_hash_move_forward_ex(&PHPDBG_G(bp)[PHPDBG_BREAK_COND], &position)) { zval *retval = NULL; int orig_interactive = CG(interactive); zval **orig_retval = EG(return_value_ptr_ptr); -- cgit v1.2.1 From f89f66d7620c316e751d5a3335a012070e7de457 Mon Sep 17 00:00:00 2001 From: Bob Weinand Date: Sun, 16 Feb 2014 17:41:50 +0100 Subject: removed warning; WS --- phpdbg_bp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpdbg_bp.c') diff --git a/phpdbg_bp.c b/phpdbg_bp.c index 1e85f039a5..609644548f 100644 --- a/phpdbg_bp.c +++ b/phpdbg_bp.c @@ -992,7 +992,7 @@ static inline phpdbg_breakbase_t *phpdbg_find_conditional_breakpoint(zend_execut for (zend_hash_internal_pointer_reset_ex(&PHPDBG_G(bp)[PHPDBG_BREAK_COND], &position); zend_hash_get_current_data_ex(&PHPDBG_G(bp)[PHPDBG_BREAK_COND], (void*)&bp, &position) == SUCCESS; - zend_hash_move_forward_ex(&PHPDBG_G(bp)[PHPDBG_BREAK_COND], &position)) { + zend_hash_move_forward_ex(&PHPDBG_G(bp)[PHPDBG_BREAK_COND], &position)) { zval *retval = NULL; int orig_interactive = CG(interactive); zval **orig_retval = EG(return_value_ptr_ptr); -- cgit v1.2.1