com php-src: - Passing strlen to phpdbg_set_breakpoint_sy mbol: phpdbg_bp.c phpdbg_bp.h phpdbg_break. c phpdbg_prompt.c
| From: | Bob Weinand | Date: | Sun, 24 Nov 2013 12:00:12 +0000 |
| Subject: | com php-src: - Passing strlen to phpdbg_set_breakpoint_sy mbol: phpdbg_bp.c phpdbg_bp.h phpdbg_break. c phpdbg_prompt.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74654@lists.php.net to get a copy of this message | ||
Commit: f4db0669d063bd7c0317f48c71f573a0b1b2c091
Author: Felipe Pena <felipensp@gmail.com> Sun, 24 Nov 2013 10:00:12 -0200
Parents: 46c899ba3024546ee4e3acacacfa9bd32d61a226
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f4db0669d063bd7c0317f48c71f573a0b1b2c091
Log:
- Passing strlen to phpdbg_set_breakpoint_symbol
Changed paths:
M phpdbg_bp.c
M phpdbg_bp.h
M phpdbg_break.c
M phpdbg_prompt.c
Diff:
diff --git a/phpdbg_bp.c b/phpdbg_bp.c
index 849b8de..8a71125 100644
--- a/phpdbg_bp.c
+++ b/phpdbg_bp.c
@@ -84,10 +84,8 @@ PHPDBG_API void phpdbg_set_breakpoint_file(const char *path, long line_num TSRML
}
} /* }}} */
-PHPDBG_API void phpdbg_set_breakpoint_symbol(const char *name TSRMLS_DC) /* {{{ */
+PHPDBG_API void phpdbg_set_breakpoint_symbol(const char *name, size_t name_len TSRMLS_DC) /* {{{ */
{
- size_t name_len = strlen(name);
-
if (!zend_hash_exists(&PHPDBG_G(bp)[PHPDBG_BREAK_SYM], name, name_len)) {
phpdbg_breaksymbol_t new_break;
diff --git a/phpdbg_bp.h b/phpdbg_bp.h
index 953d5a6..ddc363e 100644
--- a/phpdbg_bp.h
+++ b/phpdbg_bp.h
@@ -78,7 +78,7 @@ typedef struct _phpdbg_breakcond_t {
} phpdbg_breakcond_t;
PHPDBG_API void phpdbg_set_breakpoint_file(const char*, long TSRMLS_DC);
-PHPDBG_API void phpdbg_set_breakpoint_symbol(const char* TSRMLS_DC);
+PHPDBG_API void phpdbg_set_breakpoint_symbol(const char*, size_t TSRMLS_DC);
PHPDBG_API void phpdbg_set_breakpoint_method(const char*, const char* TSRMLS_DC);
PHPDBG_API void phpdbg_set_breakpoint_opcode(const char*, size_t TSRMLS_DC);
PHPDBG_API void phpdbg_set_breakpoint_opline(zend_ulong TSRMLS_DC);
diff --git a/phpdbg_break.c b/phpdbg_break.c
index 9bc9b95..22bd9f4 100644
--- a/phpdbg_break.c
+++ b/phpdbg_break.c
@@ -100,7 +100,7 @@ PHPDBG_BREAK(func) /* {{{ */
{
switch (param->type) {
case STR_PARAM:
- phpdbg_set_breakpoint_symbol(param->str TSRMLS_CC);
+ phpdbg_set_breakpoint_symbol(param->str, param->len TSRMLS_CC);
break;
phpdbg_default_switch_case();
diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index 5c276ab..a213065 100644
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -784,7 +784,7 @@ PHPDBG_COMMAND(break) /* {{{ */
phpdbg_set_breakpoint_file(param->file.name, param->file.line TSRMLS_CC);
break;
case STR_PARAM:
- phpdbg_set_breakpoint_symbol(param->str TSRMLS_CC);
+ phpdbg_set_breakpoint_symbol(param->str, param->len TSRMLS_CC);
break;
phpdbg_default_switch_case();