com php-src: export both types of conditional breakpoint properly: phpdbg_bp.c
| From: | Bob Weinand | Date: | Tue, 03 Dec 2013 00:35:20 +0000 |
| Subject: | com php-src: export both types of conditional breakpoint properly: phpdbg_bp.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75329@lists.php.net to get a copy of this message | ||
Commit: 8f835060df60f2fdbaedacdbc990371a07f5310e
Author: krakjoe <joe.watkins@live.co.uk> Tue, 3 Dec 2013 00:35:20 +0000
Parents: fd9026b94895e487db56658b2e690e99d27a9c84
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8f835060df60f2fdbaedacdbc990371a07f5310e
Log:
export both types of conditional breakpoint properly
Changed paths:
M phpdbg_bp.c
Diff:
diff --git a/phpdbg_bp.c b/phpdbg_bp.c
index 5ea7829..8fdc9ee 100644
--- a/phpdbg_bp.c
+++ b/phpdbg_bp.c
@@ -142,9 +142,35 @@ PHPDBG_API void phpdbg_export_breakpoints(FILE *handle TSRMLS_DC) /* {{{ */
} break;
case PHPDBG_BREAK_COND: {
- fprintf(handle,
- "break on %s\n",
- ((phpdbg_breakcond_t*)brake)->code);
+ phpdbg_breakcond_t *conditional = (phpdbg_breakcond_t*) brake;
+
+ if (conditional->paramed) {
+ switch (conditional->param.type) {
+ case STR_PARAM:
+ fprintf(handle,
+ "break at %s if %s\n", conditional->param.str, conditional->code);
+ break;
+
+ case METHOD_PARAM:
+ fprintf(handle,
+ "break at %s::%s if %s\n",
+ conditional->param.method.class, conditional->param.method.name,
+ conditional->code);
+ break;
+
+ case FILE_PARAM:
+ fprintf(handle,
+ "break at %s:%lu if %s\n",
+ conditional->param.file.name, conditional->param.file.line,
+ conditional->code);
+ break;
+
+ default: { /* do nothing */ } break;
+ }
+ } else {
+ fprintf(
+ handle, "break on %s\n", conditional->code);
+ }
} break;
}
}
@@ -427,6 +453,8 @@ PHPDBG_API void phpdbg_set_breakpoint_at(const phpdbg_param_t *param, const phpd
phpdbg_clear_param(
&new_param TSRMLS_CC);
goto usage;
+
+ default: { /* do nothing */ } break;
}
expr_hash += phpdbg_hash_param(&new_param TSRMLS_CC);