X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=missing.c;h=7febedf19d579b9892b633da254ef4165e5a6a2c;hp=99ec620c095c4b6877046e3b511a6a1129c0d9d6;hb=61ced187b8a3a3c21578d253e37d1a076aa0aed4;hpb=f0b91eef34357ee6146faa2a2f88d4fac7c0d66c diff --git a/missing.c b/missing.c index 99ec620..7febedf 100644 --- a/missing.c +++ b/missing.c @@ -18,264 +18,36 @@ #include "php.h" #include "missing.h" -#ifdef ZEND_ENGINE_2 - -static inline zval *new_zval(zend_class_entry *ce) -{ - zval *z; - if (ce->type & ZEND_INTERNAL_CLASS) { - z = malloc(sizeof(zval)); - } else { - ALLOC_ZVAL(z); - } - INIT_PZVAL(z); - return z; -} - -static inline zval *tmp_zval(void) -{ - zval *z; - ALLOC_ZVAL(z); - z->is_ref = 0; - z->refcount = 0; - return z; -} - - -#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION == 0) - +#ifdef WONKY int zend_declare_property_double(zend_class_entry *ce, char *name, int name_length, double value, int access_type TSRMLS_DC) { - zval *property = new_zval(ce); + zval *property = pemalloc(sizeof(zval), ce->type & ZEND_INTERNAL_CLASS); + INIT_PZVAL(property); ZVAL_DOUBLE(property, value); return zend_declare_property(ce, name, name_length, property, access_type TSRMLS_CC); } void zend_update_property_double(zend_class_entry *scope, zval *object, char *name, int name_length, double value TSRMLS_DC) { - zval *tmp = tmp_zval(); + zval *tmp = ecalloc(1, sizeof(zval)); ZVAL_DOUBLE(tmp, value); zend_update_property(scope, object, name, name_length, tmp TSRMLS_CC); } int zend_declare_property_bool(zend_class_entry *ce, char *name, int name_length, long value, int access_type TSRMLS_DC) { - zval *property = new_zval(ce); + zval *property = pemalloc(sizeof(zval), ce->type & ZEND_INTERNAL_CLASS); + INIT_PZVAL(property); ZVAL_BOOL(property, value); return zend_declare_property(ce, name, name_length, property, access_type TSRMLS_CC); } void zend_update_property_bool(zend_class_entry *scope, zval *object, char *name, int name_length, long value TSRMLS_DC) -{ - zval *tmp = tmp_zval(); +{ zval *tmp = ecalloc(1, sizeof(zval)); ZVAL_BOOL(tmp, value); zend_update_property(scope, object, name, name_length, tmp TSRMLS_CC); } - -#endif /* PHP_VERSION == 5.0 */ - -#if (PHP_MAJOR_VERSION >= 5) - -int zend_declare_class_constant(zend_class_entry *ce, char *name, size_t name_length, zval *value TSRMLS_DC) -{ - return zend_hash_add(&ce->constants_table, name, name_length, &value, sizeof(zval *), NULL); -} - -int zend_declare_class_constant_long(zend_class_entry *ce, char *name, size_t name_length, long value TSRMLS_DC) -{ - zval *constant = new_zval(ce); - ZVAL_LONG(constant, value); - return zend_declare_class_constant(ce, name, name_length, constant TSRMLS_CC); -} - -int zend_declare_class_constant_bool(zend_class_entry *ce, char *name, size_t name_length, zend_bool value TSRMLS_DC) -{ - zval *constant = new_zval(ce); - ZVAL_BOOL(constant, value); - return zend_declare_class_constant(ce, name, name_length, constant TSRMLS_CC); -} - -int zend_declare_class_constant_double(zend_class_entry *ce, char *name, size_t name_length, double value TSRMLS_DC) -{ - zval *constant = new_zval(ce); - ZVAL_DOUBLE(constant, value); - return zend_declare_class_constant(ce, name, name_length, constant TSRMLS_CC); -} - -int zend_declare_class_constant_string(zend_class_entry *ce, char *name, size_t name_length, char *value TSRMLS_DC) -{ - return zend_declare_class_constant_stringl(ce, name, name_length, value, strlen(value) TSRMLS_CC); -} - -int zend_declare_class_constant_stringl(zend_class_entry *ce, char *name, size_t name_length, char *value, size_t value_length TSRMLS_DC) -{ - zval *constant = new_zval(ce); - if (ce->type & ZEND_INTERNAL_CLASS) { - ZVAL_STRINGL(constant, zend_strndup(value, value_length), value_length, 0); - } else { - ZVAL_STRINGL(constant, value, value_length, 1); - } - return zend_declare_class_constant(ce, name, name_length, constant TSRMLS_CC); -} - - -int zend_update_static_property(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); - } - - EG(scope) = old_scope; - - return retval; -} - -int zend_update_static_property_bool(zend_class_entry *scope, char *name, size_t name_len, zend_bool value TSRMLS_DC) -{ - zval *tmp = tmp_zval(); - ZVAL_BOOL(tmp, value); - return zend_update_static_property(scope, name, name_len, tmp TSRMLS_CC); -} - -int zend_update_static_property_long(zend_class_entry *scope, char *name, size_t name_len, long value TSRMLS_DC) -{ - zval *tmp = tmp_zval(); - ZVAL_LONG(tmp, value); - return zend_update_static_property(scope, name, name_len, tmp TSRMLS_CC); -} - -int zend_update_static_property_double(zend_class_entry *scope, char *name, size_t name_len, double value TSRMLS_DC) -{ - zval *tmp = tmp_zval(); - ZVAL_DOUBLE(tmp, value); - return zend_update_static_property(scope, name, name_len, tmp TSRMLS_CC); -} - -int zend_update_static_property_string(zend_class_entry *scope, char *name, size_t name_len, char *value TSRMLS_DC) -{ - zval *tmp = tmp_zval(); - ZVAL_STRING(tmp, value, 1); - return zend_update_static_property(scope, name, name_len, tmp TSRMLS_CC); -} - -int zend_update_static_property_stringl(zend_class_entry *scope, char *name, size_t name_len, char *value, size_t value_len TSRMLS_DC) -{ - zval *tmp = tmp_zval(); - ZVAL_STRINGL(tmp, value, value_len, 1); - return zend_update_static_property(scope, name, name_len, tmp TSRMLS_CC); -} - -#endif /* PHP_MAJOR_VERSION >= 5 */ -#endif /* ZEND_ENGINE_2 */ +#endif /* * Local variables: