diff options
| author | Sebastian Bergmann <sebastian@php.net> | 2003-03-26 06:32:53 +0000 |
|---|---|---|
| committer | Sebastian Bergmann <sebastian@php.net> | 2003-03-26 06:32:53 +0000 |
| commit | 866332a4b835fe00de4278d9b41b32afb37a7244 (patch) | |
| tree | 38f19bc66cf0e0b38501f2ffc459b63170c16ad0 /Zend/zend_objects.c | |
| parent | 2dd1affcaba384e634f65952aad94ea9d4061d2f (diff) | |
| download | php-git-866332a4b835fe00de4278d9b41b32afb37a7244.tar.gz | |
Eliminate TSRMLS_FETCH() calls in zend_objects_new() and zend_objects_get_address().
Diffstat (limited to 'Zend/zend_objects.c')
| -rw-r--r-- | Zend/zend_objects.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c index 71a20e5d95..51d402c4e4 100644 --- a/Zend/zend_objects.c +++ b/Zend/zend_objects.c @@ -68,12 +68,10 @@ ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handl efree(object); } -ZEND_API zend_object_value zend_objects_new(zend_object **object, zend_class_entry *class_type) +ZEND_API zend_object_value zend_objects_new(zend_object **object, zend_class_entry *class_type TSRMLS_DC) { zend_object_value retval; - TSRMLS_FETCH(); - *object = emalloc(sizeof(zend_object)); (*object)->ce = class_type; retval.handle = zend_objects_store_put(*object, (zend_objects_store_dtor_t) zend_objects_destroy_object, NULL TSRMLS_CC); @@ -83,9 +81,8 @@ ZEND_API zend_object_value zend_objects_new(zend_object **object, zend_class_ent return retval; } -ZEND_API zend_object *zend_objects_get_address(zval *zobject) +ZEND_API zend_object *zend_objects_get_address(zval *zobject TSRMLS_DC) { - TSRMLS_FETCH(); return (zend_object *)zend_object_store_get_object(zobject TSRMLS_CC); } @@ -96,8 +93,8 @@ ZEND_API zend_object_value zend_objects_clone_obj(zval *zobject TSRMLS_DC) zend_object *new_object; zend_object_handle handle = Z_OBJ_HANDLE_P(zobject); - old_object = zend_objects_get_address(zobject); - retval = zend_objects_new(&new_object, old_object->ce); + old_object = zend_objects_get_address(zobject TSRMLS_CC); + retval = zend_objects_new(&new_object, old_object->ce TSRMLS_CC); if (old_object->ce->clone) { zval *old_obj; |