From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Mon, 29 Sep 2003 02:23:52 +0000 (+0000)
Subject: MFH(r-1.399): simplification
X-Git-Tag: php-4.3.4RC1~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a23dfb3b1190bb17c5ac9015c077fbff317b3bd1;p=php

MFH(r-1.399): simplification
---

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 884f361642..be5e273721 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -2746,10 +2746,9 @@ PHP_FUNCTION(str_replace)
 				SEPARATE_ZVAL(subject_entry);
 				php_str_replace_in_subject(*search, *replace, subject_entry, result);
 			} 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,