Use zend_string_equals API in a couple places

diff --git a/ext/opcache/Optimizer/dfa_pass.c b/ext/opcache/Optimizer/dfa_pass.c
index 033f2df2c0c1cd3078b17d771852f1b9f3cab7b4..a8bff00557d175d94cf537b52f656cd517235b07 100644 (file)
--- a/ext/opcache/Optimizer/dfa_pass.c
+++ b/ext/opcache/Optimizer/dfa_pass.c
@@ -372,8 +372,7 @@ int zend_dfa_optimize_calls(zend_op_array *op_array, zend_ssa *ssa)
                        if (call_info->caller_call_opline
                         && call_info->caller_call_opline->opcode == ZEND_DO_ICALL
                         && call_info->callee_func
-                        && ZSTR_LEN(call_info->callee_func->common.function_name) == sizeof("in_array")-1
-                        && memcmp(ZSTR_VAL(call_info->callee_func->common.function_name), "in_array", sizeof("in_array")-1) == 0
+                        && zend_string_equals_literal(call_info->callee_func->common.function_name, "in_array")
                         && (call_info->caller_init_opline->extended_value == 2
                          || (call_info->caller_init_opline->extended_value == 3
                           && (call_info->caller_call_opline - 1)->opcode == ZEND_SEND_VAL

diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index 33aeddde8967991aaca704c533d9518a516d9ebf..e5ce3cf88d00ecfe1c87e9fee2034826e18ad848 100644 (file)
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -6644,8 +6644,7 @@ static const zend_function_entry reflection_ext_functions[] = { /* {{{ */
 static zval *_reflection_write_property(zend_object *object, zend_string *name, zval *value, void **cache_slot)
 {
        if (zend_hash_exists(&object->ce->properties_info, name)
-               && ((ZSTR_LEN(name) == sizeof("name") - 1  && !memcmp(ZSTR_VAL(name), "name",  sizeof("name")))
-                       || (ZSTR_LEN(name) == sizeof("class") - 1 && !memcmp(ZSTR_VAL(name), "class", sizeof("class")))))
+               && (zend_string_equals_literal(name, "name") || zend_string_equals_literal(name, "class")))
        {
                zend_throw_exception_ex(reflection_exception_ptr, 0,
                        "Cannot set read-only property %s::$%s", ZSTR_VAL(object->ce->name), ZSTR_VAL(name));

diff --git a/ext/session/session.c b/ext/session/session.c
index 0b190f0496bd8030a4c797f8dd3712508af1a5f0..ed31912382066d32c2e9cc75370db73e80fe3597 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -471,8 +471,7 @@ static void php_session_save_current_state(int write) /* {{{ */
                                        if (PS(lazy_write) && PS(session_vars)
                                                && PS(mod)->s_update_timestamp
                                                && PS(mod)->s_update_timestamp != php_session_update_timestamp
-                                               && ZSTR_LEN(val) == ZSTR_LEN(PS(session_vars))
-                                               && !memcmp(ZSTR_VAL(val), ZSTR_VAL(PS(session_vars)), ZSTR_LEN(val))
+                                               && zend_string_equals(val, PS(session_vars))
                                        ) {
                                                ret = PS(mod)->s_update_timestamp(&PS(mod_data), PS(id), val, PS(gc_maxlifetime));
                                        } else {

diff --git a/sapi/phpdbg/phpdbg_wait.c b/sapi/phpdbg/phpdbg_wait.c
index db493ccf30d1555b574f787b010a642e238da4c7..ec78f18db726f7372ac610f1f1aa6525395e6745 100644 (file)
--- a/sapi/phpdbg/phpdbg_wait.c
+++ b/sapi/phpdbg/phpdbg_wait.c
@@ -34,7 +34,7 @@ static void phpdbg_rebuild_http_globals_array(int type, const char *name) {
 
 
 static int phpdbg_dearm_autoglobals(zend_auto_global *auto_global) {
-       if (ZSTR_LEN(auto_global->name) != sizeof("GLOBALS") - 1 || memcmp(ZSTR_VAL(auto_global->name), "GLOBALS", sizeof("GLOBALS") - 1)) {
+       if (zend_string_equals_literal(auto_global->name, "GLOBALS")) {
                auto_global->armed = 0;
        }