diff options
| author | Nikita Popov <nikic@php.net> | 2014-08-25 22:40:58 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-08-25 22:40:58 +0200 |
| commit | 46b53e815c39bad6226cdc0ca6caa76cabeb09ef (patch) | |
| tree | 85f9d2e19369cd9260678b9af4dd3da1be9c66d4 /Zend/zend_closures.c | |
| parent | 899a1ed59a2f7133367dc39f95b143c019822520 (diff) | |
| download | php-git-46b53e815c39bad6226cdc0ca6caa76cabeb09ef.tar.gz | |
Add zend_string_equals and zend_string_equals_literal
Diffstat (limited to 'Zend/zend_closures.c')
| -rw-r--r-- | Zend/zend_closures.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c index 525be9dca1..f0920fb993 100644 --- a/Zend/zend_closures.c +++ b/Zend/zend_closures.c @@ -91,8 +91,7 @@ ZEND_METHOD(Closure, bind) ce = NULL; } else { zend_string *class_name = zval_get_string(scope_arg); - if ((class_name->len == sizeof("static") - 1) && - (memcmp("static", class_name->val, sizeof("static") - 1) == 0)) { + if (zend_string_equals_literal(class_name, "static")) { ce = closure->func.common.scope; } else if ((ce = zend_lookup_class_ex(class_name, NULL, 1 TSRMLS_CC)) == NULL) { zend_error(E_WARNING, "Class '%s' not found", class_name->val); @@ -158,9 +157,7 @@ static zend_function *zend_closure_get_method(zend_object **object, zend_string lc_name = zend_string_alloc(method->len, 0); zend_str_tolower_copy(lc_name->val, method->val, method->len); - if ((method->len == sizeof(ZEND_INVOKE_FUNC_NAME)-1) && - memcmp(lc_name->val, ZEND_INVOKE_FUNC_NAME, sizeof(ZEND_INVOKE_FUNC_NAME)-1) == 0 - ) { + if (zend_string_equals_literal(method, ZEND_INVOKE_FUNC_NAME)) { zend_string_free(lc_name); return zend_get_closure_invoke_method(*object TSRMLS_CC); } |