diff options
| author | Andi Gutmans <andi@php.net> | 2002-05-14 16:15:50 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2002-05-14 16:15:50 +0000 |
| commit | 1fe8df14c65c57544ff6ebf94138cdf0d5e09698 (patch) | |
| tree | 7729bd0d032d8fe394d23d01e71438be352c1b6b | |
| parent | b63236bd841df2fd96073d342c71f5c8a5b55655 (diff) | |
| download | php-git-1fe8df14c65c57544ff6ebf94138cdf0d5e09698.tar.gz | |
- constructor_called is supposed to be destructor_called
| -rw-r--r-- | Zend/zend_objects.c | 12 | ||||
| -rw-r--r-- | Zend/zend_objects.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c index a019c9bcc4..3cf69b9498 100644 --- a/Zend/zend_objects.c +++ b/Zend/zend_objects.c @@ -69,7 +69,7 @@ void zend_objects_call_destructors(zend_objects *objects TSRMLS_DC) for (i = 1; i < objects->top ; i++) { if (EG(objects).object_buckets[i].valid) { - EG(objects).object_buckets[i].constructor_called = 1; + EG(objects).object_buckets[i].destructor_called = 1; zend_objects_destroy_object(&EG(objects).object_buckets[i].bucket.obj.object, i TSRMLS_CC); EG(objects).object_buckets[i].valid = 0; } @@ -95,7 +95,7 @@ zend_object_value zend_objects_new(zend_object **object, zend_class_entry *class handle = EG(objects).top++; } EG(objects).object_buckets[handle].valid = 1; - EG(objects).object_buckets[handle].constructor_called = 0; + EG(objects).object_buckets[handle].destructor_called = 0; EG(objects).object_buckets[handle].bucket.obj.refcount = 1; *object = &EG(objects).object_buckets[handle].bucket.obj.object; @@ -146,8 +146,8 @@ void zend_objects_delete_obj(zval *zobject TSRMLS_DC) object = &EG(objects).object_buckets[handle].bucket.obj.object; - if (!EG(objects).object_buckets[handle].constructor_called) { - EG(objects).object_buckets[handle].constructor_called = 1; + if (!EG(objects).object_buckets[handle].destructor_called) { + EG(objects).object_buckets[handle].destructor_called = 1; zend_objects_destroy_object(object, handle TSRMLS_CC); } @@ -172,9 +172,9 @@ void zend_objects_del_ref(zval *zobject TSRMLS_DC) zend_object *object; do { if (EG(objects).object_buckets[handle].valid) { - if (!EG(objects).object_buckets[handle].constructor_called) { + if (!EG(objects).object_buckets[handle].destructor_called) { object = &EG(objects).object_buckets[handle].bucket.obj.object; - EG(objects).object_buckets[handle].constructor_called = 1; + EG(objects).object_buckets[handle].destructor_called = 1; zend_objects_destroy_object(object, handle TSRMLS_CC); if (EG(objects).object_buckets[handle].bucket.obj.refcount == 0) { ZEND_OBJECTS_ADD_TO_FREE_LIST(); diff --git a/Zend/zend_objects.h b/Zend/zend_objects.h index 0b17a9bb1c..dcb718b088 100644 --- a/Zend/zend_objects.h +++ b/Zend/zend_objects.h @@ -5,7 +5,7 @@ typedef struct _zend_object_bucket { zend_bool valid; - zend_bool constructor_called; + zend_bool destructor_called; union _bucket { struct { zend_object object; |