com php-src: use zend_string_equals_ci: Zend/zend_c ompile.c Zend/zend_string.h
| From: | Xinchen Hui | Date: | Fri, 29 Aug 2014 05:19:14 +0000 |
| Subject: | com php-src: use zend_string_equals_ci: Zend/zend_c ompile.c Zend/zend_string.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81280@lists.php.net to get a copy of this message | ||
Commit: 0763d6b98d746e64921325f8b44910d6c46ab86e
Author: Xinchen Hui <laruence@php.net> Fri, 29 Aug 2014 13:19:14 +0800
Parents: 49bd049b7e46a93f915b0db906271b21543d07ea
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0763d6b98d746e64921325f8b44910d6c46ab86e
Log:
use zend_string_equals_ci
Changed paths:
M Zend/zend_compile.c
M Zend/zend_string.h
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index ca0b242..92b26b2 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -3051,14 +3051,11 @@ ZEND_API void zend_initialize_class_data(zend_class_entry *ce, zend_bool
nullify
uint32_t zend_get_class_fetch_type(zend_string *name) /* {{{ */
{
- if (name->len == sizeof("self") - 1 &&
- !strncasecmp(name->val, "self", sizeof("self") - 1)) {
+ if (zend_string_equals_literal_ci(name, "self")) {
return ZEND_FETCH_CLASS_SELF;
- } else if (name->len == sizeof("parent") - 1 &&
- !strncasecmp(name->val, "parent", sizeof("parent") - 1)) {
+ } else if (zend_string_equals_literal_ci(name, "parent")) {
return ZEND_FETCH_CLASS_PARENT;
- } else if (name->len == sizeof("static") - 1 &&
- !strncasecmp(name->val, "static", sizeof("static") - 1)) {
+ } else if (zend_string_equals_literal_ci(name, "static")) {
return ZEND_FETCH_CLASS_STATIC;
} else {
return ZEND_FETCH_CLASS_DEFAULT;
@@ -3253,10 +3250,6 @@ static inline zend_bool zend_string_equals_str_ci(zend_string *str1,
zend_string
}
/* }}} */
-#define zend_string_equals_literal_ci(str, c) \
- ((str)->len == sizeof(c) - 1 \
- && !zend_binary_strcasecmp((str)->val, (str)->len, (c), sizeof(c) - 1))
-
static void zend_adjust_for_fetch_type(zend_op *opline, uint32_t type) /* {{{ */
{
switch (type & BP_VAR_MASK) {
diff --git a/Zend/zend_string.h b/Zend/zend_string.h
index 479e920..a2b5fb9 100644
--- a/Zend/zend_string.h
+++ b/Zend/zend_string.h
@@ -214,6 +214,9 @@ static zend_always_inline zend_bool zend_string_equals(zend_string *s1, zend_str
return s1 == s2 || (s1->len == s2->len && !memcmp(s1->val, s2->val,
s1->len));
}
+#define zend_string_equals_literal_ci(str, c) \
+ ((str)->len == sizeof(c) - 1 && !zend_binary_strcasecmp((str)->val, (str)->len,
(c), sizeof(c) - 1))
+
#define zend_string_equals_literal(str, literal) \
((str)->len == sizeof(literal)-1 && !memcmp((str)->val, literal, sizeof(literal) -
1))