diff options
| author | Andi Gutmans <andi@php.net> | 2002-03-15 16:26:17 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2002-03-15 16:26:17 +0000 |
| commit | c84a4ead958c0b052d0db918a07861f3cf7b98d0 (patch) | |
| tree | 20ab67301b2bdf6853dc7b1590d245c6a350638b /Zend/zend_objects.c | |
| parent | db84afb206c8fe93539e9aa4465258ef6f8d7821 (diff) | |
| download | php-git-c84a4ead958c0b052d0db918a07861f3cf7b98d0.tar.gz | |
- Pass TSRMLS to callbacks.
Diffstat (limited to 'Zend/zend_objects.c')
| -rw-r--r-- | Zend/zend_objects.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c index dd5c25dec2..a019c9bcc4 100644 --- a/Zend/zend_objects.c +++ b/Zend/zend_objects.c @@ -121,10 +121,9 @@ zend_object *zend_objects_get_address(zval *zobject) return &EG(objects).object_buckets[handle].bucket.obj.object; } -void zend_objects_add_ref(zval *object) +void zend_objects_add_ref(zval *object TSRMLS_DC) { zend_object_handle handle = Z_OBJ_HANDLE_P(object); - TSRMLS_FETCH(); if (!EG(objects).object_buckets[handle].valid) { zend_error(E_ERROR, "Trying to add reference to invalid object"); @@ -136,11 +135,10 @@ void zend_objects_add_ref(zval *object) #endif } -void zend_objects_delete_obj(zval *zobject) +void zend_objects_delete_obj(zval *zobject TSRMLS_DC) { zend_object *object; zend_object_handle handle = Z_OBJ_HANDLE_P(zobject); - TSRMLS_FETCH(); if (!EG(objects).object_buckets[handle].valid) { zend_error(E_ERROR, "Trying to delete invalid object"); @@ -166,10 +164,9 @@ void zend_objects_delete_obj(zval *zobject) EG(objects).free_list_head = handle; \ EG(objects).object_buckets[handle].valid = 0; -void zend_objects_del_ref(zval *zobject) +void zend_objects_del_ref(zval *zobject TSRMLS_DC) { zend_object_handle handle = Z_OBJ_HANDLE_P(zobject); - TSRMLS_FETCH(); if (--EG(objects).object_buckets[handle].bucket.obj.refcount == 0) { zend_object *object; @@ -199,14 +196,13 @@ void zend_objects_del_ref(zval *zobject) #endif } -zend_object_value zend_objects_clone_obj(zval *zobject) +zend_object_value zend_objects_clone_obj(zval *zobject TSRMLS_DC) { zend_object_value retval; zend_object *old_object; zend_object *new_object; zend_object_handle handle = Z_OBJ_HANDLE_P(zobject); - TSRMLS_FETCH(); if (!EG(objects).object_buckets[handle].valid) { zend_error(E_ERROR, "Trying to clone invalid object"); |