diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-05-15 10:13:38 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-05-15 10:14:22 +0200 |
| commit | 406c95758d16829d728afcbfc65ed751173293e8 (patch) | |
| tree | b49f1a54baf8c1dc48fddd56dbb955741a7dfd9b /sapi | |
| parent | ba0731cd53b47de1d1dbadb63079da636b579fed (diff) | |
| download | php-git-406c95758d16829d728afcbfc65ed751173293e8.tar.gz | |
Remove some uses of zend_inline_hash_func
There's no need to force-inline the hashing for all of these.
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/phpdbg/phpdbg_bp.c | 4 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_cmd.c | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sapi/phpdbg/phpdbg_bp.c b/sapi/phpdbg/phpdbg_bp.c index e6b7c10225..a29d4442fb 100644 --- a/sapi/phpdbg/phpdbg_bp.c +++ b/sapi/phpdbg/phpdbg_bp.c @@ -906,7 +906,7 @@ static inline void phpdbg_create_conditional_break(phpdbg_breakcond_t *brake, co PHPDBG_API void phpdbg_set_breakpoint_expression(const char *expr, size_t expr_len) /* {{{ */ { - zend_ulong expr_hash = zend_inline_hash_func(expr, expr_len); + zend_ulong expr_hash = zend_hash_func(expr, expr_len); phpdbg_breakcond_t new_break; if (!zend_hash_index_exists(&PHPDBG_G(bp)[PHPDBG_BREAK_COND], expr_hash)) { @@ -925,7 +925,7 @@ PHPDBG_API void phpdbg_set_breakpoint_at(const phpdbg_param_t *param) /* {{{ */ if (param->next) { condition = param->next; - hash = zend_inline_hash_func(condition->str, condition->len); + hash = zend_hash_func(condition->str, condition->len); if (!zend_hash_index_exists(&PHPDBG_G(bp)[PHPDBG_BREAK_COND], hash)) { phpdbg_create_conditional_break(&new_break, param, condition->str, condition->len, hash); diff --git a/sapi/phpdbg/phpdbg_cmd.c b/sapi/phpdbg/phpdbg_cmd.c index b7578e3a86..750628c800 100644 --- a/sapi/phpdbg/phpdbg_cmd.c +++ b/sapi/phpdbg/phpdbg_cmd.c @@ -199,16 +199,16 @@ PHPDBG_API zend_ulong phpdbg_hash_param(const phpdbg_param_t *param) /* {{{ */ break; case STR_PARAM: - hash += zend_inline_hash_func(param->str, param->len); + hash += zend_hash_func(param->str, param->len); break; case METHOD_PARAM: - hash += zend_inline_hash_func(param->method.class, strlen(param->method.class)); - hash += zend_inline_hash_func(param->method.name, strlen(param->method.name)); + hash += zend_hash_func(param->method.class, strlen(param->method.class)); + hash += zend_hash_func(param->method.name, strlen(param->method.name)); break; case FILE_PARAM: - hash += zend_inline_hash_func(param->file.name, strlen(param->file.name)); + hash += zend_hash_func(param->file.name, strlen(param->file.name)); hash += param->file.line; if (param->num) hash += param->num; @@ -223,13 +223,13 @@ PHPDBG_API zend_ulong phpdbg_hash_param(const phpdbg_param_t *param) /* {{{ */ break; case NUMERIC_FUNCTION_PARAM: - hash += zend_inline_hash_func(param->str, param->len); + hash += zend_hash_func(param->str, param->len); hash += param->num; break; case NUMERIC_METHOD_PARAM: - hash += zend_inline_hash_func(param->method.class, strlen(param->method.class)); - hash += zend_inline_hash_func(param->method.name, strlen(param->method.name)); + hash += zend_hash_func(param->method.class, strlen(param->method.class)); + hash += zend_hash_func(param->method.name, strlen(param->method.name)); if (param->num) hash+= param->num; break; |