Add Z_PARAM_LONG_OR_NULL macro

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index acc6bb9cf37181449ef6d8ea97ad4f3440e0527f..0b9fcd76af42c0aff0868bf57018c71e36f9ac94 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -1349,6 +1349,8 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_error(int num, char *e
 #define Z_PARAM_LONG(dest) \
        Z_PARAM_LONG_EX(dest, _dummy, 0, 0)
 
+#define Z_PARAM_LONG_OR_NULL(dest, is_null) \
+       Z_PARAM_LONG_EX(dest, is_null, 1, 0)
 
 /* no old equivalent */
 #define Z_PARAM_NUMBER_EX(dest, check_null) \

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 3b827e519cffd800d68a79df9c422347fc78f8be..d3aac515a7d7b59a4823b7b11674dbdbf875e2b9 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -3473,7 +3473,7 @@ PHP_FUNCTION(array_slice)
                Z_PARAM_ARRAY(input)
                Z_PARAM_LONG(offset)
                Z_PARAM_OPTIONAL
-               Z_PARAM_LONG_EX(length, length_is_null, 1, 0)
+               Z_PARAM_LONG_OR_NULL(length, length_is_null)
                Z_PARAM_BOOL(preserve_keys)
        ZEND_PARSE_PARAMETERS_END();
 

diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c
index 1f84b486fc3febf68997985f8a54272f7fe65f5b..7c08083f5b63cdb2ec7b127f136f03ecf1b9c410 100644 (file)
--- a/ext/standard/streamsfuncs.c
+++ b/ext/standard/streamsfuncs.c
@@ -753,7 +753,7 @@ PHP_FUNCTION(stream_select)
                Z_PARAM_ARRAY_EX2(r_array, 1, 1, 0)
                Z_PARAM_ARRAY_EX2(w_array, 1, 1, 0)
                Z_PARAM_ARRAY_EX2(e_array, 1, 1, 0)
-               Z_PARAM_LONG_EX(sec, secnull, 1, 0)
+               Z_PARAM_LONG_OR_NULL(sec, secnull)
                Z_PARAM_OPTIONAL
                Z_PARAM_LONG(usec)
        ZEND_PARSE_PARAMETERS_END();
@@ -1493,7 +1493,7 @@ PHP_FUNCTION(stream_socket_enable_crypto)
                Z_PARAM_RESOURCE(zstream)
                Z_PARAM_BOOL(enable)
                Z_PARAM_OPTIONAL
-               Z_PARAM_LONG_EX(cryptokind, cryptokindnull, 1, 0)
+               Z_PARAM_LONG_OR_NULL(cryptokind, cryptokindnull)
                Z_PARAM_RESOURCE(zsessstream)
        ZEND_PARSE_PARAMETERS_END();
 

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 948a1ffce1871d2f9005a5b10bfdd011dfde73f7..b2be54e2cd3eac0ec7244de8bd846e11011044a3 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -6098,7 +6098,7 @@ PHP_FUNCTION(substr_compare)
                Z_PARAM_STR(s2)
                Z_PARAM_LONG(offset)
                Z_PARAM_OPTIONAL
-               Z_PARAM_LONG_EX(len, len_is_default, 1, 0)
+               Z_PARAM_LONG_OR_NULL(len, len_is_default)
                Z_PARAM_BOOL(cs)
        ZEND_PARSE_PARAMETERS_END();