diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2013-11-01 16:16:58 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2013-11-01 16:16:58 +0100 |
| commit | b45043a1b71c29a0c7b8de9e4929dde08bd61216 (patch) | |
| tree | 07e97d65a100eef0cfc1bb998f649475380d612d /Zend/zend_execute_API.c | |
| parent | b56c1ca95e16ea1c2a3ce251b91297d0a81a9070 (diff) | |
| download | php-git-b45043a1b71c29a0c7b8de9e4929dde08bd61216.tar.gz | |
converted several switches to ifs and made more opcache friendly
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index e5b68c7de1..12047f0518 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -520,8 +520,7 @@ ZEND_API int zval_update_constant_ex(zval **pp, void *arg, zend_class_entry *sco } if (actual[0] == '\\') { if (inline_change) { - memmove(Z_STRVAL_P(p), Z_STRVAL_P(p)+1, Z_STRLEN_P(p)); - --Z_STRLEN_P(p); + memmove(Z_STRVAL_P(p), Z_STRVAL_P(p)+1, Z_STRLEN_P(p)--); } else { ++actual; } @@ -626,7 +625,7 @@ ZEND_API int zval_update_constant_ex(zval **pp, void *arg, zend_class_entry *sco if ((str_index[str_index_len - 2] & IS_CONSTANT_UNQUALIFIED) == 0) { zend_error(E_ERROR, "Undefined constant '%s'", save); } - zend_error(E_NOTICE, "Use of undefined constant %s - assumed '%s'", str_index, str_index); + zend_error(E_NOTICE, "Use of undefined constant %s - assumed '%s'", str_index, str_index); } ZVAL_STRINGL(&const_value, str_index, str_index_len-3, 1); } @@ -640,7 +639,7 @@ ZEND_API int zval_update_constant_ex(zval **pp, void *arg, zend_class_entry *sco /* preserve this bit for inheritance */ Z_TYPE_PP(element) |= IS_CONSTANT_INDEX; - zval_ptr_dtor(element); + zval_ptr_dtor(element); *element = new_val; } |