From 103b3c6626844194abc8bb7ac8aff4f8a007febe Mon Sep 17 00:00:00 2001 From: Moriyoshi Koizumi Date: Mon, 29 Sep 2003 02:23:40 +0000 Subject: [PATCH] Simplification. --- ext/standard/string.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ext/standard/string.c b/ext/standard/string.c index 0efa5e728b..fe7553f13c 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -3192,10 +3192,9 @@ static void php_str_replace_common(INTERNAL_FUNCTION_PARAMETERS, int case_sensit SEPARATE_ZVAL(subject_entry); php_str_replace_in_subject(*search, *replace, subject_entry, result, case_sensitivity, (argc > 3) ? &count : NULL); } else { - MAKE_STD_ZVAL(result); - SEPARATE_ZVAL(subject_entry); - *result = **subject_entry; - zval_copy_ctor(result); + ALLOC_ZVAL(result); + ZVAL_ADDREF(*subject_entry); + COPY_PZVAL_TO_ZVAL(*result, *subject_entry); } /* Add to return array */ switch (zend_hash_get_current_key_ex(Z_ARRVAL_PP(subject), &string_key, -- 2.40.0