com php-src: fix find breakpoint function: phpdbg_bp.c
| From: | Bob Weinand | Date: | Wed, 27 Nov 2013 13:32:38 +0000 |
| Subject: | com php-src: fix find breakpoint function: phpdbg_bp.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74561@lists.php.net to get a copy of this message | ||
Commit: 22995849639356831eab377dd262e27605700649
Author: krakjoe <joe.watkins@live.co.uk> Wed, 27 Nov 2013 13:32:38 +0000
Parents: 0fad595a1f7dfb948c2d382ea3314e694f5e04db
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=22995849639356831eab377dd262e27605700649
Log:
fix find breakpoint function
Changed paths:
M phpdbg_bp.c
Diff:
diff --git a/phpdbg_bp.c b/phpdbg_bp.c
index dacead3..45eaa07 100644
--- a/phpdbg_bp.c
+++ b/phpdbg_bp.c
@@ -554,14 +554,14 @@ PHPDBG_API phpdbg_breakbase_t* phpdbg_find_breakpoint(zend_execute_data*
execute
}
/* conditions cannot be executed by eval()'d code */
- if (!(PHPDBG_G(flags) & PHPDBG_IN_EVAL)
- && (PHPDBG_G(flags) & PHPDBG_HAS_COND_BP)
- && (base = phpdbg_find_conditional_breakpoint(TSRMLS_C))) {
+ if (!(PHPDBG_G(flags) & PHPDBG_IN_EVAL) &&
+ (PHPDBG_G(flags) & PHPDBG_HAS_COND_BP) &&
+ (base = phpdbg_find_conditional_breakpoint(TSRMLS_C))) {
return base;
}
- if (PHPDBG_G(flags) & PHPDBG_HAS_FILE_BP
- && (base = phpdbg_find_breakpoint_file(execute_data->op_array TSRMLS_CC))) {
+ if ((PHPDBG_G(flags) & PHPDBG_HAS_FILE_BP) &&
+ (base = phpdbg_find_breakpoint_file(execute_data->op_array TSRMLS_CC))) {
return base;
}
@@ -575,13 +575,13 @@ PHPDBG_API phpdbg_breakbase_t* phpdbg_find_breakpoint(zend_execute_data*
execute
}
}
- if (PHPDBG_G(flags) & PHPDBG_HAS_OPLINE_BP
- && phpdbg_find_breakpoint_opline(execute_data->opline TSRMLS_CC) == SUCCESS) {
+ if ((PHPDBG_G(flags) & PHPDBG_HAS_OPLINE_BP) &&
+ (base = phpdbg_find_breakpoint_opline(execute_data->opline TSRMLS_CC))) {
return base;
}
- if (PHPDBG_G(flags) & PHPDBG_HAS_OPCODE_BP
- && phpdbg_find_breakpoint_opcode(execute_data->opline->opcode TSRMLS_CC) ==
SUCCESS) {
+ if ((PHPDBG_G(flags) & PHPDBG_HAS_OPCODE_BP) &&
+ (base = phpdbg_find_breakpoint_opcode(execute_data->opline->opcode TSRMLS_CC))) {
return base;
}