diff options
| author | Zeev Suraski <zeev@php.net> | 2001-07-31 05:32:25 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-07-31 05:32:25 +0000 |
| commit | 57507b4ea6bb2a38578444ca8359806f241fa8f5 (patch) | |
| tree | 0862768712ffba36a16f9f4bdb9e48d6a80e1cde | |
| parent | d76cf1da183f79711d7699a2ff85f743da3f9dd2 (diff) | |
| download | php-git-57507b4ea6bb2a38578444ca8359806f241fa8f5.tar.gz | |
More TSRMLS_FETCH annihilation
| -rw-r--r-- | Zend/zend_list.c | 6 | ||||
| -rw-r--r-- | Zend/zend_list.h | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Zend/zend_list.c b/Zend/zend_list.c index db418ac186..6f868715da 100644 --- a/Zend/zend_list.c +++ b/Zend/zend_list.c @@ -163,6 +163,7 @@ void list_entry_destructor(void *ptr) { zend_rsrc_list_entry *le = (zend_rsrc_list_entry *) ptr; zend_rsrc_list_dtors_entry *ld; + TSRMLS_FETCH(); if (zend_hash_index_find(&list_destructors, le->type,(void **) &ld)==SUCCESS) { switch (ld->type) { @@ -173,7 +174,7 @@ void list_entry_destructor(void *ptr) break; case ZEND_RESOURCE_LIST_TYPE_EX: if (ld->list_dtor_ex) { - ld->list_dtor_ex(le); + ld->list_dtor_ex(le TSRMLS_CC); } break; EMPTY_SWITCH_DEFAULT_CASE() @@ -188,6 +189,7 @@ void plist_entry_destructor(void *ptr) { zend_rsrc_list_entry *le = (zend_rsrc_list_entry *) ptr; zend_rsrc_list_dtors_entry *ld; + TSRMLS_FETCH(); if (zend_hash_index_find(&list_destructors, le->type,(void **) &ld)==SUCCESS) { switch (ld->type) { @@ -198,7 +200,7 @@ void plist_entry_destructor(void *ptr) break; case ZEND_RESOURCE_LIST_TYPE_EX: if (ld->plist_dtor_ex) { - ld->plist_dtor_ex(le); + ld->plist_dtor_ex(le TSRMLS_CC); } break; EMPTY_SWITCH_DEFAULT_CASE() diff --git a/Zend/zend_list.h b/Zend/zend_list.h index 0b75115233..c17d2c5ff5 100644 --- a/Zend/zend_list.h +++ b/Zend/zend_list.h @@ -34,8 +34,8 @@ typedef struct _zend_rsrc_list_entry { int refcount; } zend_rsrc_list_entry; -typedef void (*rsrc_dtor_func_t)(zend_rsrc_list_entry *rsrc); -#define ZEND_RSRC_DTOR_FUNC(name) void name(zend_rsrc_list_entry *rsrc) +typedef void (*rsrc_dtor_func_t)(zend_rsrc_list_entry *rsrc TSRMLS_DC); +#define ZEND_RSRC_DTOR_FUNC(name) void name(zend_rsrc_list_entry *rsrc TSRMLS_DC) typedef struct _zend_rsrc_list_dtors_entry { /* old style destructors */ |