break;
case ZEND_RESOURCE_LIST_TYPE_EX:
if (ld->list_dtor_ex) {
- ld->list_dtor_ex(res->ptr TSRMLS_CC);
+ ld->list_dtor_ex(res TSRMLS_CC);
}
break;
EMPTY_SWITCH_DEFAULT_CASE()
}
-ZEND_API int zend_register_list_destructors(void (*ld)(void *), void (*pld)(void *), int module_number)
+ZEND_API int zend_register_list_destructors(rsrc_dtor_func_t ld, rsrc_dtor_func_t pld, int module_number)
{
zend_rsrc_list_dtors_entry *lde;
zval zv;
lde = malloc(sizeof(zend_rsrc_list_dtors_entry));
- lde->list_dtor=(void (*)(void *)) ld;
- lde->plist_dtor=(void (*)(void *)) pld;
+ lde->list_dtor = ld;
+ lde->plist_dtor = pld;
lde->list_dtor_ex = lde->plist_dtor_ex = NULL;
lde->module_number = module_number;
lde->resource_id = list_destructors.nNextFreeElement;
typedef struct _zend_rsrc_list_dtors_entry {
/* old style destructors */
- void (*list_dtor)(void *);
- void (*plist_dtor)(void *);
+ void (*list_dtor)(zend_resource *);
+ void (*plist_dtor)(zend_resource *);
/* new style destructors */
rsrc_dtor_func_t list_dtor_ex;
} zend_rsrc_list_dtors_entry;
-#define register_list_destructors(ld, pld) zend_register_list_destructors((void (*)(void *))ld, (void (*)(void *))pld, module_number);
-ZEND_API int zend_register_list_destructors(void (*ld)(void *), void (*pld)(void *), int module_number);
+#define register_list_destructors(ld, pld) zend_register_list_destructors(ld, pld, module_number);
+ZEND_API int zend_register_list_destructors(rsrc_dtor_func_t ld, rsrc_dtor_func_t pld, int module_number);
ZEND_API int zend_register_list_destructors_ex(rsrc_dtor_func_t ld, rsrc_dtor_func_t pld, const char *type_name, int module_number);
void list_entry_destructor(zval *ptr);