Skip to content

Commit 4ee24cf

Browse files
committed
Convert macros to inline function in Zend Interfaces
1 parent 0acfe44 commit 4ee24cf

File tree

1 file changed

+17
-8
lines changed

1 file changed

+17
-8
lines changed

Zend/zend_interfaces.h

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,23 @@ typedef struct _zend_user_iterator {
4040

4141
ZEND_API zval* zend_call_method(zend_object *object, zend_class_entry *obj_ce, zend_function **fn_proxy, const char *function_name, size_t function_name_len, zval *retval, uint32_t param_count, zval* arg1, zval* arg2);
4242

43-
#define zend_call_method_with_0_params(obj, obj_ce, fn_proxy, function_name, retval) \
44-
zend_call_method(obj, obj_ce, fn_proxy, function_name, sizeof(function_name)-1, retval, 0, NULL, NULL)
45-
46-
#define zend_call_method_with_1_params(obj, obj_ce, fn_proxy, function_name, retval, arg1) \
47-
zend_call_method(obj, obj_ce, fn_proxy, function_name, sizeof(function_name)-1, retval, 1, arg1, NULL)
48-
49-
#define zend_call_method_with_2_params(obj, obj_ce, fn_proxy, function_name, retval, arg1, arg2) \
50-
zend_call_method(obj, obj_ce, fn_proxy, function_name, sizeof(function_name)-1, retval, 2, arg1, arg2)
43+
static inline zval* zend_call_method_with_0_params(zend_object *object, zend_class_entry *obj_ce,
44+
zend_function **fn_proxy, const char *function_name, zval *retval)
45+
{
46+
return zend_call_method(object, obj_ce, fn_proxy, function_name, strlen(function_name), retval, 0, NULL, NULL);
47+
}
48+
49+
static inline zval* zend_call_method_with_1_params(zend_object *object, zend_class_entry *obj_ce,
50+
zend_function **fn_proxy, const char *function_name, zval *retval, zval* arg1)
51+
{
52+
return zend_call_method(object, obj_ce, fn_proxy, function_name, strlen(function_name), retval, 1, arg1, NULL);
53+
}
54+
55+
static inline zval* zend_call_method_with_2_params(zend_object *object, zend_class_entry *obj_ce,
56+
zend_function **fn_proxy, const char *function_name, zval *retval, zval* arg1, zval* arg2)
57+
{
58+
return zend_call_method(object, obj_ce, fn_proxy, function_name, strlen(function_name), retval, 2, arg1, arg2);
59+
}
5160

5261
#define REGISTER_MAGIC_INTERFACE(class_name, class_name_str) \
5362
{\

0 commit comments

Comments
 (0)