[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard string.c

[Moriyoshi Koizumi]

moriyoshi               Sun Sep 28 22:23:53 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src/ext/standard       string.c 
  Log:
  MFH(r-1.399): simplification
  
  
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.333.2.35 
php-src/ext/standard/string.c:1.333.2.36
--- php-src/ext/standard/string.c:1.333.2.35    Fri Sep 26 13:59:59 2003
+++ php-src/ext/standard/string.c       Sun Sep 28 22:23:52 2003
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: string.c,v 1.333.2.35 2003/09/26 17:59:59 pollita Exp $ */
+/* $Id: string.c,v 1.333.2.36 2003/09/29 02:23:52 moriyoshi Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -2746,10 +2746,9 @@
                                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,

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php