com php-src: Micro opt: ext/standard/array.c
| From: | Xinchen Hui | Date: | Wed, 01 Apr 2015 04:05:19 +0000 |
| Subject: | com php-src: Micro opt: ext/standard/array.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85990@lists.php.net to get a copy of this message | ||
Commit: af812eac4c9727bdfb90cac1a35ab53d741cb7eb
Author: Xinchen Hui <laruence@php.net> Wed, 1 Apr 2015 12:05:19 +0800
Parents: 9203608878546008eda484972cbc05b23ed04ada
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=af812eac4c9727bdfb90cac1a35ab53d741cb7eb
Log:
Micro opt
Changed paths:
M ext/standard/array.c
Diff:
diff --git a/ext/standard/array.c b/ext/standard/array.c
index 441d03f..f90f287 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -1355,7 +1355,7 @@ static int php_valid_var_name(char *var_name, size_t var_name_len) /* {{{ */
size_t i;
int ch;
- if (!var_name || !var_name_len) {
+ if (!var_name_len) {
return 0;
}
@@ -1371,7 +1371,8 @@ static int php_valid_var_name(char *var_name, size_t var_name_len) /* {{{ */
/* And these as the rest: [a-zA-Z0-9_\x7f-\xff] */
if (var_name_len > 1) {
- for (i = 1; i < var_name_len; i++) {
+ i = 1;
+ do {
ch = (int)((unsigned char *)var_name)[i];
if (var_name[i] != '_' &&
(ch < 48 /* 0 */ || /* 9 */ ch > 57) &&
@@ -1381,7 +1382,7 @@ static int php_valid_var_name(char *var_name, size_t var_name_len) /* {{{ */
) {
return 0;
}
- }
+ } while (++i < var_name_len);
}
return 1;
}
@@ -1530,7 +1531,7 @@ PHP_FUNCTION(extract)
break;
}
- if (Z_TYPE(final_name) != IS_NULL && php_valid_var_name(Z_STRVAL(final_name),
Z_STRLEN(final_name))) {
+ if (Z_TYPE(final_name) == IS_STRING && php_valid_var_name(Z_STRVAL(final_name),
Z_STRLEN(final_name))) {
if (extract_refs) {
zval *orig_var;