com php-src: Avoid string duplication: ext/standard/assert.c ext/standard/basic_functions.c
| From: | Dmitry Stogov | Date: | Tue, 02 Sep 2014 05:52:23 +0000 |
| Subject: | com php-src: Avoid string duplication: ext/standard/assert.c ext/standard/basic_functions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81361@lists.php.net to get a copy of this message | ||
Commit: 1670772dc606079088357ce1c9a0c4293cd7b3d9
Author: Dmitry Stogov <dmitry@zend.com> Tue, 2 Sep 2014 09:52:23 +0400
Parents: f789568707e23a334c5edc944511976f269b1f74
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1670772dc606079088357ce1c9a0c4293cd7b3d9
Log:
Avoid string duplication
Changed paths:
M ext/standard/assert.c
M ext/standard/basic_functions.c
Diff:
diff --git a/ext/standard/assert.c b/ext/standard/assert.c
index 50babfa..94fee5a 100644
--- a/ext/standard/assert.c
+++ b/ext/standard/assert.c
@@ -59,7 +59,7 @@ static PHP_INI_MH(OnChangeCallback) /* {{{ */
ZVAL_UNDEF(&ASSERTG(callback));
}
if (new_value && (Z_TYPE(ASSERTG(callback)) != IS_UNDEF || new_value->len)) {
- ZVAL_STRINGL(&ASSERTG(callback), new_value->val, new_value->len);
+ ZVAL_STR(&ASSERTG(callback), zend_string_copy(new_value));
}
} else {
if (ASSERTG(cb)) {
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 4ecf4ec...2f5c5b6 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -5234,15 +5234,15 @@ static int php_ini_get_option(zval *zv TSRMLS_DC, int num_args, va_list
args, ze
array_init(&option);
if (ini_entry->orig_value) {
- add_assoc_stringl(&option, "global_value", ini_entry->orig_value->val,
ini_entry->orig_value->len);
+ add_assoc_str(&option, "global_value",
zend_string_copy(ini_entry->orig_value));
} else if (ini_entry->value) {
- add_assoc_stringl(&option, "global_value", ini_entry->value->val,
ini_entry->value->len);
+ add_assoc_str(&option, "global_value", zend_string_copy(ini_entry->value));
} else {
add_assoc_null(&option, "global_value");
}
if (ini_entry->value) {
- add_assoc_stringl(&option, "local_value", ini_entry->value->val,
ini_entry->value->len);
+ add_assoc_str(&option, "local_value", zend_string_copy(ini_entry->value));
} else {
add_assoc_null(&option, "local_value");
}