File tree Expand file tree Collapse file tree 2 files changed +5
-8
lines changed Expand file tree Collapse file tree 2 files changed +5
-8
lines changed Original file line number Diff line number Diff line change @@ -51,13 +51,10 @@ ZEND_API int ZEND_FASTCALL zend_list_delete(zend_resource *res)
51
51
}
52
52
}
53
53
54
- ZEND_API int ZEND_FASTCALL zend_list_free (zend_resource * res )
54
+ ZEND_API void ZEND_FASTCALL zend_list_free (zend_resource * res )
55
55
{
56
- if (GC_REFCOUNT (res ) <= 0 ) {
57
- return zend_hash_index_del (& EG (regular_list ), res -> handle );
58
- } else {
59
- return SUCCESS ;
60
- }
56
+ ZEND_ASSERT (GC_REFCOUNT (res ) == 0 );
57
+ zend_hash_index_del (& EG (regular_list ), res -> handle );
61
58
}
62
59
63
60
static void zend_resource_dtor (zend_resource * res )
@@ -82,7 +79,7 @@ static void zend_resource_dtor(zend_resource *res)
82
79
ZEND_API int ZEND_FASTCALL zend_list_close (zend_resource * res )
83
80
{
84
81
if (GC_REFCOUNT (res ) <= 0 ) {
85
- return zend_list_free (res );
82
+ zend_list_free (res );
86
83
} else if (res -> type >= 0 ) {
87
84
zend_resource_dtor (res );
88
85
}
Original file line number Diff line number Diff line change @@ -53,7 +53,7 @@ int zend_init_rsrc_list_dtors(void);
53
53
void zend_destroy_rsrc_list_dtors (void );
54
54
55
55
ZEND_API zval * ZEND_FASTCALL zend_list_insert (void * ptr , int type );
56
- ZEND_API int ZEND_FASTCALL zend_list_free (zend_resource * res );
56
+ ZEND_API void ZEND_FASTCALL zend_list_free (zend_resource * res );
57
57
ZEND_API int ZEND_FASTCALL zend_list_delete (zend_resource * res );
58
58
ZEND_API int ZEND_FASTCALL zend_list_close (zend_resource * res );
59
59
You can’t perform that action at this time.
0 commit comments