Skip to content

Commit 95e04fe

Browse files
committed
cleanup redundand macros
1 parent 365f428 commit 95e04fe

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

Zend/zend_list.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ ZEND_API zval *zend_list_insert(void *ptr, int type)
4444
return zend_hash_index_add_new(&EG(regular_list), index, &zv);
4545
}
4646

47-
ZEND_API int _zend_list_delete(zend_resource *res)
47+
ZEND_API int zend_list_delete(zend_resource *res)
4848
{
4949
if (--GC_REFCOUNT(res) <= 0) {
5050
return zend_hash_index_del(&EG(regular_list), res->handle);
@@ -53,7 +53,7 @@ ZEND_API int _zend_list_delete(zend_resource *res)
5353
}
5454
}
5555

56-
ZEND_API int _zend_list_free(zend_resource *res)
56+
ZEND_API int zend_list_free(zend_resource *res)
5757
{
5858
if (GC_REFCOUNT(res) <= 0) {
5959
return zend_hash_index_del(&EG(regular_list), res->handle);
@@ -79,7 +79,7 @@ static void zend_resource_dtor(zend_resource *res)
7979
}
8080

8181

82-
ZEND_API int _zend_list_close(zend_resource *res)
82+
ZEND_API int zend_list_close(zend_resource *res)
8383
{
8484
if (GC_REFCOUNT(res) <= 0) {
8585
return zend_list_delete(res);

Zend/zend_list.h

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,9 @@ int zend_init_rsrc_list_dtors(void);
5555
void zend_destroy_rsrc_list_dtors(void);
5656

5757
ZEND_API zval *zend_list_insert(void *ptr, int type);
58-
ZEND_API int _zend_list_free(zend_resource *res);
59-
ZEND_API int _zend_list_delete(zend_resource *res);
60-
ZEND_API int _zend_list_close(zend_resource *res);
61-
62-
#define zend_list_free(res) _zend_list_free(res)
63-
#define zend_list_delete(res) _zend_list_delete(res)
64-
#define zend_list_close(res) _zend_list_close(res)
58+
ZEND_API int zend_list_free(zend_resource *res);
59+
ZEND_API int zend_list_delete(zend_resource *res);
60+
ZEND_API int zend_list_close(zend_resource *res);
6561

6662
ZEND_API zend_resource *zend_register_resource(zval *rsrc_result, void *rsrc_pointer, int rsrc_type);
6763
ZEND_API void *zend_fetch_resource(zval *passed_id, int default_id, const char *resource_type_name, int *found_resource_type, int num_resource_types, ...);

0 commit comments

Comments
 (0)