clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Small fixes

Browse Source
This commit is contained in:
Zeev Suraski 2004-02-04 11:56:07 +00:00
parent 27f54a4c13
commit 3ac58bffcf
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zend/zend_compile.c
View File

@ -298,7 +298,6 @@ void zend_do_binary_assign_op(zend_uchar op, znode *result, znode *op1, znode *o
*result = last_op->result;
break;
case ZEND_FETCH_DIM_RW:
#if 1
last_op->opcode = op;
last_op->extended_value = ZEND_ASSIGN_DIM;
@ -309,7 +308,6 @@ void zend_do_binary_assign_op(zend_uchar op, znode *result, znode *op1, znode *o
SET_UNUSED(opline->result);
*result = last_op->result;
break;
#endif
default:
opline->opcode = op;
opline->op1 = *op1;

12
Zend/zend_objects.c
View File

@ -25,12 +25,6 @@
#include "zend_API.h"
#include "zend_interfaces.h"
static inline void zend_nuke_object(zend_object *object TSRMLS_DC)
{
zend_hash_destroy(object->properties);
FREE_HASHTABLE(object->properties);
efree(object);
}
ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handle handle TSRMLS_DC)
{
@ -46,7 +40,6 @@ ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handl
if (object->ce != EG(scope)) {
zend_class_entry *ce = object->ce;
zend_nuke_object(object TSRMLS_CC); /* unfortunately we *must* destroy it now anyway */
zend_error(EG(in_execution) ? E_ERROR : E_WARNING,
"Call to private %s::__destruct() from context '%s'%s",
ce->name,
@ -60,7 +53,6 @@ ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handl
if (!zend_check_protected(destructor->common.scope, EG(scope))) {
zend_class_entry *ce = object->ce;
zend_nuke_object(object TSRMLS_CC); /* unfortunately we *must* destroy it now anyway */
zend_error(EG(in_execution) ? E_ERROR : E_WARNING,
"Call to protected %s::__destruct() from context '%s'%s",
ce->name,
@ -82,7 +74,9 @@ ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handl
ZEND_API void zend_objects_free_object_storage(zend_object *object TSRMLS_DC)
{
zend_nuke_object(object TSRMLS_CC);
zend_hash_destroy(object->properties);
FREE_HASHTABLE(object->properties);
efree(object);
}
ZEND_API zend_object_value zend_objects_new(zend_object **object, zend_class_entry *class_type TSRMLS_DC)