diff options
| author | Pierre Joye <pajoye@php.net> | 2010-09-16 09:13:19 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2010-09-16 09:13:19 +0000 |
| commit | aa0ed267a29b83099715c48f25bcbf9642bf7bb2 (patch) | |
| tree | d834f5f091ed0a5681caa816a41c5de8f2eb1cb3 /Zend | |
| parent | 14e77486e06e21bfc29d80327bdb85ff7e1f0bfa (diff) | |
| download | php-git-aa0ed267a29b83099715c48f25bcbf9642bf7bb2.tar.gz | |
- use TSRMLS_*C instead of TSRMLS_FETCH in zend_list_insert
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_list.c | 7 | ||||
| -rw-r--r-- | Zend/zend_list.h | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/Zend/zend_list.c b/Zend/zend_list.c index 83377e401b..b9d20dcc8b 100644 --- a/Zend/zend_list.c +++ b/Zend/zend_list.c @@ -32,11 +32,10 @@ ZEND_API int le_index_ptr; static HashTable list_destructors; -ZEND_API int zend_list_insert(void *ptr, int type) +ZEND_API int zend_list_insert(void *ptr, int type TSRMLS_DC) { int index; zend_rsrc_list_entry le; - TSRMLS_FETCH(); le.ptr=ptr; le.type=type; @@ -92,11 +91,11 @@ ZEND_API int _zend_list_addref(int id TSRMLS_DC) } -ZEND_API int zend_register_resource(zval *rsrc_result, void *rsrc_pointer, int rsrc_type) +ZEND_API int zend_register_resource(zval *rsrc_result, void *rsrc_pointer, int rsrc_type TSRMLS_DC) { int rsrc_id; - rsrc_id = zend_list_insert(rsrc_pointer, rsrc_type); + rsrc_id = zend_list_insert(rsrc_pointer, rsrc_type TSRMLS_CC); if (rsrc_result) { rsrc_result->value.lval = rsrc_id; diff --git a/Zend/zend_list.h b/Zend/zend_list.h index 67a63e35bb..35fcc38483 100644 --- a/Zend/zend_list.h +++ b/Zend/zend_list.h @@ -70,7 +70,7 @@ void zend_destroy_rsrc_list(HashTable *ht TSRMLS_DC); int zend_init_rsrc_list_dtors(void); void zend_destroy_rsrc_list_dtors(void); -ZEND_API int zend_list_insert(void *ptr, int type); +ZEND_API int zend_list_insert(void *ptr, int type TSRMLS_DC); ZEND_API int _zend_list_addref(int id TSRMLS_DC); ZEND_API int _zend_list_delete(int id TSRMLS_DC); ZEND_API void *_zend_list_find(int id, int *type TSRMLS_DC); @@ -79,7 +79,7 @@ ZEND_API void *_zend_list_find(int id, int *type TSRMLS_DC); #define zend_list_delete(id) _zend_list_delete(id TSRMLS_CC) #define zend_list_find(id, type) _zend_list_find(id, type TSRMLS_CC) -ZEND_API int zend_register_resource(zval *rsrc_result, void *rsrc_pointer, int rsrc_type); +ZEND_API int zend_register_resource(zval *rsrc_result, void *rsrc_pointer, int rsrc_type TSRMLS_DC); ZEND_API void *zend_fetch_resource(zval **passed_id TSRMLS_DC, int default_id, char *resource_type_name, int *found_resource_type, int num_resource_types, ...); ZEND_API char *zend_rsrc_list_get_rsrc_type(int resource TSRMLS_DC); @@ -107,7 +107,7 @@ extern ZEND_API int le_index_ptr; /* list entry type for index pointers */ (rsrc = (rsrc_type) zend_fetch_resource(passed_id TSRMLS_CC, default_id, resource_type_name, NULL, 2, resource_type1, resource_type2)) #define ZEND_REGISTER_RESOURCE(rsrc_result, rsrc_pointer, rsrc_type) \ - zend_register_resource(rsrc_result, rsrc_pointer, rsrc_type); + zend_register_resource(rsrc_result, rsrc_pointer, rsrc_type TSRMLS_CC); #define ZEND_GET_RESOURCE_TYPE_ID(le_id, le_type_name) \ if (le_id == 0) { \ |