com php-src: Avoid string duplication: Zend/zend_builtin_fu nctions.c
| From: | Dmitry Stogov | Date: | Mon, 21 Apr 2014 21:41:09 +0000 |
| Subject: | com php-src: Avoid string duplication: Zend/zend_builtin_fu nctions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77319@lists.php.net to get a copy of this message | ||
Commit: a821009a6e268232037fb3a0945611a337b77d6d
Author: Dmitry Stogov <dmitry@zend.com> Tue, 22 Apr 2014 01:41:09 +0400
Parents: ff6dc3e1f2c047f222be8ccf4d2c18ebff4be1ff
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a821009a6e268232037fb3a0945611a337b77d6d
Log:
Avoid string duplication
Changed paths:
M Zend/zend_builtin_functions.c
Diff:
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 182c34f..4664532 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -662,14 +662,13 @@ ZEND_FUNCTION(error_reporting)
Define a new constant */
ZEND_FUNCTION(define)
{
- char *name;
- int name_len;
+ zend_string *name;
zval *val, val_free;
zend_bool non_cs = 0;
int case_sensitive = CONST_CS;
zend_constant c;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz|b", &name, &name_len,
&val, &non_cs) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Sz|b", &name, &val,
&non_cs) == FAILURE) {
return;
}
@@ -678,7 +677,7 @@ ZEND_FUNCTION(define)
}
/* class constant, check if there is name and make sure class is valid & exists */
- if (zend_memnstr(name, "::", sizeof("::") - 1, name + name_len)) {
+ if (zend_memnstr(name->val, "::", sizeof("::") - 1, name->val +
name->len)) {
zend_error(E_WARNING, "Class constants cannot be defined or redefined");
RETURN_FALSE;
}
@@ -718,10 +717,7 @@ repeat:
ZVAL_DUP(&c.value, val);
zval_ptr_dtor(&val_free);
c.flags = case_sensitive; /* non persistent */
- c.name = STR_INIT(name, name_len, 1);
- if(c.name == NULL) {
- RETURN_FALSE;
- }
+ c.name = STR_COPY(name);
c.module_number = PHP_USER_CONSTANT;
if (zend_register_constant(&c TSRMLS_CC) == SUCCESS) {
RETURN_TRUE;