cvs: ZendEngine2 / zend_variables.c zend_variables.h

andi Sun Sep 26 22:29:01 2004 EDT Modified files: /ZendEngine2 zend_variables.c zend_variables.h Log: - Make zval_copy_ctor() return void like dtor(). No one ever checks the - return value which is SUCCESS always. http://cvs.php.net/diff.php/ZendEngine2/zend_variables.c?r1=1.59&r2=1.60&ty=u Index: ZendEngine2/zend_variables.c diff -u ZendEngine2/zend_variables.c:1.59 ZendEngine2/zend_variables.c:1.60 --- ZendEngine2/zend_variables.c:1.59 Sun Sep 26 16:03:54 2004 +++ ZendEngine2/zend_variables.c Sun Sep 26 22:29:01 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_variables.c,v 1.59 2004/09/26 20:03:54 andi Exp $ */ +/* $Id: zend_variables.c,v 1.60 2004/09/27 02:29:01 andi Exp $ */ #include <stdio.h> #include "zend.h" @@ -101,7 +101,7 @@ } -ZEND_API int _zval_copy_ctor_func(zval *zvalue ZEND_FILE_LINE_DC) +ZEND_API void _zval_copy_ctor_func(zval *zvalue ZEND_FILE_LINE_DC) { switch (zvalue->type) { case IS_RESOURCE: { @@ -127,7 +127,7 @@ TSRMLS_FETCH(); if (zvalue->value.ht == &EG(symbol_table)) { - return SUCCESS; /* do nothing */ + return; /* do nothing */ } ALLOC_HASHTABLE_REL(tmp_ht); zend_hash_init(tmp_ht, 0, NULL, ZVAL_PTR_DTOR, 0); @@ -142,7 +142,6 @@ } break; } - return SUCCESS; } http://cvs.php.net/diff.php/ZendEngine2/zend_variables.h?r1=1.31&r2=1.32&ty=u Index: ZendEngine2/zend_variables.h diff -u ZendEngine2/zend_variables.h:1.31 ZendEngine2/zend_variables.h:1.32 --- ZendEngine2/zend_variables.h:1.31 Sun Sep 26 18:19:57 2004 +++ ZendEngine2/zend_variables.h Sun Sep 26 22:29:01 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_variables.h,v 1.31 2004/09/26 22:19:57 helly Exp $ */ +/* $Id: zend_variables.h,v 1.32 2004/09/27 02:29:01 andi Exp $ */ #ifndef ZEND_VARIABLES_H #define ZEND_VARIABLES_H @@ -35,14 +35,14 @@ _zval_dtor_func(zvalue ZEND_FILE_LINE_CC); } -ZEND_API int _zval_copy_ctor_func(zval *zvalue ZEND_FILE_LINE_DC); +ZEND_API void _zval_copy_ctor_func(zval *zvalue ZEND_FILE_LINE_DC); -static inline int _zval_copy_ctor(zval *zvalue ZEND_FILE_LINE_DC) +static inline void _zval_copy_ctor(zval *zvalue ZEND_FILE_LINE_DC) { if (zvalue->type <= IS_BOOL) { - return SUCCESS; + return; } - return _zval_copy_ctor_func(zvalue ZEND_FILE_LINE_CC); + _zval_copy_ctor_func(zvalue ZEND_FILE_LINE_CC); }