|
19 | 19 | #include "phpdbg.h"
|
20 | 20 | #include "phpdbg_prompt.h"
|
21 | 21 | #include "phpdbg_bp.h"
|
| 22 | +#include "phpdbg_break.h" |
22 | 23 | #include "phpdbg_utils.h"
|
23 | 24 |
|
24 | 25 | ZEND_DECLARE_MODULE_GLOBALS(phpdbg);
|
@@ -55,10 +56,10 @@ static PHP_MINIT_FUNCTION(phpdbg) /* {{{ */
|
55 | 56 | #endif
|
56 | 57 |
|
57 | 58 | REGISTER_LONG_CONSTANT("PHPDBG_FILE", FILE_PARAM, CONST_CS|CONST_PERSISTENT);
|
58 |
| - REGISTER_LONG_CONSTANT("PHPDBG_METHOD", METHOD_PARAM, CONST_CS|CONST_PERSISTENT); |
| 59 | + REGISTER_LONG_CONSTANT("PHPDBG_METHOD", METHOD_PARAM, CONST_CS|CONST_PERSISTENT); |
59 | 60 | REGISTER_LONG_CONSTANT("PHPDBG_LINENO", NUMERIC_PARAM, CONST_CS|CONST_PERSISTENT);
|
60 | 61 | REGISTER_LONG_CONSTANT("PHPDBG_FUNC", STR_PARAM, CONST_CS|CONST_PERSISTENT);
|
61 |
| - |
| 62 | + |
62 | 63 | return SUCCESS;
|
63 | 64 | } /* }}} */
|
64 | 65 |
|
@@ -140,34 +141,34 @@ static PHP_FUNCTION(phpdbg_break)
|
140 | 141 | long type;
|
141 | 142 | char *expr = NULL;
|
142 | 143 | zend_uint expr_len = 0;
|
143 |
| - |
| 144 | + |
144 | 145 | if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ls", &type, &expr, &expr_len) == FAILURE) {
|
145 | 146 | return;
|
146 | 147 | }
|
147 |
| - |
| 148 | + |
148 | 149 | switch (type) {
|
149 | 150 | case METHOD_PARAM:
|
150 | 151 | phpdbg_do_break_method(
|
151 | 152 | expr, expr_len TSRMLS_CC);
|
152 | 153 | break;
|
153 |
| - |
| 154 | + |
154 | 155 | case FILE_PARAM:
|
155 | 156 | phpdbg_do_break_file(
|
156 | 157 | expr, expr_len TSRMLS_CC);
|
157 | 158 | break;
|
158 |
| - |
| 159 | + |
159 | 160 | case NUMERIC_PARAM:
|
160 | 161 | phpdbg_do_break_lineno(
|
161 | 162 | expr, expr_len TSRMLS_CC);
|
162 | 163 | break;
|
163 |
| - |
| 164 | + |
164 | 165 | case STR_PARAM:
|
165 | 166 | phpdbg_do_break_func(
|
166 | 167 | expr, expr_len TSRMLS_CC);
|
167 | 168 | break;
|
168 |
| - |
| 169 | + |
169 | 170 | default: zend_error(
|
170 |
| - E_WARNING, "unrecognized parameter type %d", type); |
| 171 | + E_WARNING, "unrecognized parameter type %ld", type); |
171 | 172 | }
|
172 | 173 | } else if (EG(current_execute_data) && EG(active_op_array)) {
|
173 | 174 | zend_ulong opline_num = (EG(current_execute_data)->opline -
|
|
0 commit comments