cvs: php-src /ext/spl spl_array.c
| From: | Marcus Boerger | Date: | Thu, 12 Feb 2004 21:43:11 +0000 |
| Subject: | cvs: php-src /ext/spl spl_array.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-26172@lists.php.net to get a copy of this message | ||
helly Thu Feb 12 16:43:11 2004 EDT
Modified files:
/php-src/ext/spl spl_array.c
Log:
Fix (thx Andi)
http://cvs.php.net/diff.php/php-src/ext/spl/spl_array.c?r1=1.32&r2=1.33&ty=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.32 php-src/ext/spl/spl_array.c:1.33
--- php-src/ext/spl/spl_array.c:1.32 Thu Feb 12 15:52:48 2004
+++ php-src/ext/spl/spl_array.c Thu Feb 12 16:43:10 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_array.c,v 1.32 2004/02/12 20:52:48 helly Exp $ */
+/* $Id: spl_array.c,v 1.33 2004/02/12 21:43:10 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -198,11 +198,7 @@
switch(Z_TYPE_P(offset)) {
case IS_STRING:
- if (!value->is_ref) {
- value->refcount++;
- } else {
- SEPARATE_ZVAL_IF_NOT_REF(&value);
- }
+ value->refcount++;
zend_symtable_update(HASH_OF(intern->array), Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1,
(void**)&value, sizeof(void*), NULL);
return;
case IS_DOUBLE:
@@ -214,11 +210,7 @@
} else {
index = Z_LVAL_P(offset);
}
- if (!value->is_ref) {
- value->refcount++;
- } else {
- SEPARATE_ZVAL_IF_NOT_REF(&value);
- }
+ value->refcount++;
add_index_zval(intern->array, index, value);
return;
default: