archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-17 06:28:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

-clonning+cloning

Browse source
This commit is contained in:
Sebastian Bergmann 2004-03-29 15:20:50 +00:00
parent 75d1e4ca7d
commit c29e9277d0
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Zend/zend_execute.c
View file

@ -394,7 +394,7 @@ static inline void zend_assign_to_object(znode *result, zval **object_ptr, znode
if (Z_OBJ_HANDLER_P(value, clone_obj) == NULL) { if (Z_OBJ_HANDLER_P(value, clone_obj) == NULL) {
zend_error(E_ERROR, "Trying to clone an uncloneable object of class %s", Z_OBJCE_P(orig_value)->name); zend_error(E_ERROR, "Trying to clone an uncloneable object of class %s", Z_OBJCE_P(orig_value)->name);
} }
zend_error(E_STRICT, "Implicit clonning object of class '%s' because of 'zend.ze1_compatibility_mode'", Z_OBJCE_P(orig_value)->name); zend_error(E_STRICT, "Implicit cloning object of class '%s' because of 'zend.ze1_compatibility_mode'", Z_OBJCE_P(orig_value)->name);
value->value.obj = Z_OBJ_HANDLER_P(orig_value, clone_obj)(orig_value TSRMLS_CC); value->value.obj = Z_OBJ_HANDLER_P(orig_value, clone_obj)(orig_value TSRMLS_CC);
} else if (value_op->op_type == IS_TMP_VAR) { } else if (value_op->op_type == IS_TMP_VAR) {
zval *orig_value = value; zval *orig_value = value;
@ -573,7 +573,7 @@ static inline void zend_assign_to_variable(znode *result, znode *op1, znode *op2
*variable_ptr = *value; *variable_ptr = *value;
variable_ptr->refcount = refcount; variable_ptr->refcount = refcount;
variable_ptr->is_ref = 1; variable_ptr->is_ref = 1;
zend_error(E_STRICT, "Implicit clonning object of class '%s' because of 'zend.ze1_compatibility_mode'", Z_OBJCE_P(value)->name); zend_error(E_STRICT, "Implicit cloning object of class '%s' because of 'zend.ze1_compatibility_mode'", Z_OBJCE_P(value)->name);
variable_ptr->value.obj = Z_OBJ_HANDLER_P(value, clone_obj)(value TSRMLS_CC); variable_ptr->value.obj = Z_OBJ_HANDLER_P(value, clone_obj)(value TSRMLS_CC);
if (type != IS_TMP_VAR) { if (type != IS_TMP_VAR) {
value->refcount--; value->refcount--;
@ -590,7 +590,7 @@ static inline void zend_assign_to_variable(znode *result, znode *op1, znode *op2
} }
*variable_ptr = *value; *variable_ptr = *value;
INIT_PZVAL(variable_ptr); INIT_PZVAL(variable_ptr);
zend_error(E_STRICT, "Implicit clonning object of class '%s' because of 'zend.ze1_compatibility_mode'", Z_OBJCE_P(value)->name); zend_error(E_STRICT, "Implicit cloning object of class '%s' because of 'zend.ze1_compatibility_mode'", Z_OBJCE_P(value)->name);
variable_ptr->value.obj = Z_OBJ_HANDLER_P(value, clone_obj)(value TSRMLS_CC); variable_ptr->value.obj = Z_OBJ_HANDLER_P(value, clone_obj)(value TSRMLS_CC);
} }
} else if (PZVAL_IS_REF(variable_ptr)) { } else if (PZVAL_IS_REF(variable_ptr)) {
@ -2871,7 +2871,7 @@ return_by_value:
if (Z_OBJ_HT_P(retval_ptr)->clone_obj == NULL) { if (Z_OBJ_HT_P(retval_ptr)->clone_obj == NULL) {
zend_error(E_ERROR, "Trying to clone an uncloneable object of class %s", Z_OBJCE_P(retval_ptr)->name); zend_error(E_ERROR, "Trying to clone an uncloneable object of class %s", Z_OBJCE_P(retval_ptr)->name);
} }
zend_error(E_STRICT, "Implicit clonning object of class '%s' because of 'zend.ze1_compatibility_mode'", Z_OBJCE_P(retval_ptr)->name); zend_error(E_STRICT, "Implicit cloning object of class '%s' because of 'zend.ze1_compatibility_mode'", Z_OBJCE_P(retval_ptr)->name);
(*EG(return_value_ptr_ptr))->value.obj = Z_OBJ_HT_P(retval_ptr)->clone_obj(retval_ptr TSRMLS_CC); (*EG(return_value_ptr_ptr))->value.obj = Z_OBJ_HT_P(retval_ptr)->clone_obj(retval_ptr TSRMLS_CC);
} else if (!EG(free_op1)) { /* Not a temp var */ } else if (!EG(free_op1)) { /* Not a temp var */
if (PZVAL_IS_REF(retval_ptr) && retval_ptr->refcount > 0) { if (PZVAL_IS_REF(retval_ptr) && retval_ptr->refcount > 0) {