- ditch warnings

[m6w6/ext-http] / missing.c

diff --git a/missing.c b/missing.c
index 3390c75d0de18a55c495bf7eab49de6226778a4c..3e7dbfabb1c2cff7a3940b4f0d55c5eb105a2bda 100644 (file)
--- a/missing.c
+++ b/missing.c
@@ -130,6 +130,7 @@ int zend_update_static_property(zend_class_entry *scope, char *name, size_t name
        } else if (*property == value) {
                retval = SUCCESS;
        } else {
+               value->refcount++;
                if (PZVAL_IS_REF(*property)) {
                        zval_dtor(*property);
                        (*property)->type = value->type;
@@ -139,137 +140,11 @@ int zend_update_static_property(zend_class_entry *scope, char *name, size_t name
                                zval_copy_ctor(*property);
                        }
                } else {
-                       **property = *value;
-                       zval_copy_ctor(*property);
+                       REPLACE_ZVAL_VALUE(property, value, 1);
                }
                retval = SUCCESS;
        }
-       
-       if (!value->refcount) {
-               zval_dtor(value);
-               FREE_ZVAL(value);
-       }
-       
-       EG(scope) = old_scope;
-       
-       return retval;
-}
-
-int trash(zend_class_entry *scope, char *name, size_t name_len, zval *value TSRMLS_DC)
-{
-       int retval;
-       zval **property = NULL;
-       zend_class_entry *old_scope = EG(scope);
-       
-       EG(scope) = scope;
-       
-       if (!(property = zend_std_get_static_property(scope, name, name_len, 0 TSRMLS_CC))) {
-               retval = FAILURE;
-       } else if (*property == value) {
-               retval = SUCCESS;
-       } else if (scope->type & ZEND_INTERNAL_CLASS) {
-               int refcount;
-               zend_uchar is_ref;
-       
-               refcount = (*property)->refcount;
-               is_ref = (*property)->is_ref;
-               
-               /* clean */
-               switch (Z_TYPE_PP(property))
-               {
-                       case IS_BOOL: case IS_LONG: case IS_NULL:
-                       break;
-                       
-                       case IS_RESOURCE:
-                               zend_list_delete(Z_LVAL_PP(property));
-                       break;
-                       
-                       case IS_STRING: case IS_CONSTANT:
-                               free(Z_STRVAL_PP(property));
-                       break;
-                       
-                       case IS_OBJECT:
-                               if (Z_OBJ_HT_PP(property)->del_ref) {
-                                       Z_OBJ_HT_PP(property)->del_ref(*property TSRMLS_CC);
-                               }
-                       break;
-                       
-                       case IS_ARRAY: case IS_CONSTANT_ARRAY:
-                               if (Z_ARRVAL_PP(property) && Z_ARRVAL_PP(property) != &EG(symbol_table)) {
-                                       zend_hash_destroy(Z_ARRVAL_PP(property));
-                                       free(Z_ARRVAL_PP(property));
-                               }
-                       break;
-               }
-               
-               /* copy */
-               **property = *value;
-               
-               /* ctor */              
-               switch (Z_TYPE_PP(property))
-               {
-                       case IS_BOOL: case IS_LONG: case IS_NULL:
-                       break;
-                       
-                       case IS_RESOURCE:
-                               zend_list_addref(Z_LVAL_PP(property));
-                       break;
-                       
-                       case IS_STRING: case IS_CONSTANT:
-                               Z_STRVAL_PP(property) = (char *) zend_strndup(Z_STRVAL_PP(property), Z_STRLEN_PP(property));
-                       break;
-                       
-                       case IS_OBJECT:
-                               if (Z_OBJ_HT_PP(property)->add_ref) {
-                                       Z_OBJ_HT_PP(property)->add_ref(*property TSRMLS_CC);
-                               }
-                       break;
-                       
-                       case IS_ARRAY: case IS_CONSTANT_ARRAY:
-                       {
-                               if (Z_ARRVAL_PP(property) != &EG(symbol_table)) {
-                                       zval *tmp;
-                                       HashTable *old = Z_ARRVAL_PP(property);
-                                       
-                                       Z_ARRVAL_PP(property) = (HashTable *) malloc(sizeof(HashTable));
-                                       zend_hash_init(Z_ARRVAL_PP(property), 0, NULL, ZVAL_PTR_DTOR, 0);
-                                       zend_hash_copy(Z_ARRVAL_PP(property), old, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
-                               }
-                       }
-                       break;
-               }
-               
-               (*property)->refcount = refcount;
-               (*property)->is_ref = is_ref;
-               
-               retval = SUCCESS;
-               
-       } else {
-               if (PZVAL_IS_REF(*property)) {
-                       zval_dtor(*property);
-                       (*property)->type = value->type;
-                       (*property)->value = value->value;
-                       
-                       if (value->refcount) {
-                               zval_copy_ctor(*property);
-                       }
-                       
-                       retval = SUCCESS;
-               } else {
-                       value->refcount++;
-                       if (PZVAL_IS_REF(value)) {
-                               SEPARATE_ZVAL(&value);
-                       }
-                       
-                       retval = zend_hash_update(scope->static_members, name, name_len, &value, sizeof(zval *), NULL);
-               }
-       }
-       
-       if (!value->refcount) {
-               zval_dtor(value);
-               FREE_ZVAL(value);
-       }
-       
+       zval_ptr_dtor(&value);
        EG(scope) = old_scope;
        
        return retval;
@@ -314,7 +189,7 @@ void zend_fix_static_properties(zend_class_entry *ce, HashTable *static_members
 {
        zend_hash_copy(static_members, ce->static_members, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
        zend_hash_destroy(ce->static_members);
-       zend_hash_init_ex(ce->static_members, 0, NULL, ZVAL_PTR_DTOR, 1, 0);
+       zend_hash_init_ex(ce->static_members, static_members->nNumOfElements, NULL, ZVAL_PTR_DTOR, 1, 0);
 }
 
 void zend_init_static_properties(zend_class_entry *ce, HashTable *static_members TSRMLS_DC)