Skip to content

Commit 9437c32

Browse files
authored
ext/intl: common use fast ZPP (#14422)
1 parent 8c08b03 commit 9437c32

File tree

2 files changed

+13
-33
lines changed

2 files changed

+13
-33
lines changed

ext/intl/common/common_enum.cpp

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -208,9 +208,7 @@ PHP_METHOD(IntlIterator, current)
208208
zval *data;
209209
INTLITERATOR_METHOD_INIT_VARS;
210210

211-
if (zend_parse_parameters_none() == FAILURE) {
212-
RETURN_THROWS();
213-
}
211+
ZEND_PARSE_PARAMETERS_NONE();
214212

215213
INTLITERATOR_METHOD_FETCH_OBJECT;
216214
data = ii->iterator->funcs->get_current_data(ii->iterator);
@@ -223,9 +221,7 @@ PHP_METHOD(IntlIterator, key)
223221
{
224222
INTLITERATOR_METHOD_INIT_VARS;
225223

226-
if (zend_parse_parameters_none() == FAILURE) {
227-
RETURN_THROWS();
228-
}
224+
ZEND_PARSE_PARAMETERS_NONE();
229225

230226
INTLITERATOR_METHOD_FETCH_OBJECT;
231227

@@ -240,9 +236,7 @@ PHP_METHOD(IntlIterator, next)
240236
{
241237
INTLITERATOR_METHOD_INIT_VARS;
242238

243-
if (zend_parse_parameters_none() == FAILURE) {
244-
RETURN_THROWS();
245-
}
239+
ZEND_PARSE_PARAMETERS_NONE();
246240

247241
INTLITERATOR_METHOD_FETCH_OBJECT;
248242
ii->iterator->funcs->move_forward(ii->iterator);
@@ -255,9 +249,7 @@ PHP_METHOD(IntlIterator, rewind)
255249
{
256250
INTLITERATOR_METHOD_INIT_VARS;
257251

258-
if (zend_parse_parameters_none() == FAILURE) {
259-
RETURN_THROWS();
260-
}
252+
ZEND_PARSE_PARAMETERS_NONE();
261253

262254
INTLITERATOR_METHOD_FETCH_OBJECT;
263255
if (ii->iterator->funcs->rewind) {
@@ -272,9 +264,7 @@ PHP_METHOD(IntlIterator, valid)
272264
{
273265
INTLITERATOR_METHOD_INIT_VARS;
274266

275-
if (zend_parse_parameters_none() == FAILURE) {
276-
RETURN_THROWS();
277-
}
267+
ZEND_PARSE_PARAMETERS_NONE();
278268

279269
INTLITERATOR_METHOD_FETCH_OBJECT;
280270
RETURN_BOOL(ii->iterator->funcs->valid(ii->iterator) == SUCCESS);

ext/intl/common/common_error.c

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@
2323
/* {{{ Get code of the last occurred error. */
2424
PHP_FUNCTION( intl_get_error_code )
2525
{
26-
if (zend_parse_parameters_none() == FAILURE) {
27-
RETURN_THROWS();
28-
}
26+
ZEND_PARSE_PARAMETERS_NONE();
2927

3028
RETURN_LONG( intl_error_get_code( NULL ) );
3129
}
@@ -34,9 +32,7 @@ PHP_FUNCTION( intl_get_error_code )
3432
/* {{{ Get text description of the last occurred error. */
3533
PHP_FUNCTION( intl_get_error_message )
3634
{
37-
if (zend_parse_parameters_none() == FAILURE) {
38-
RETURN_THROWS();
39-
}
35+
ZEND_PARSE_PARAMETERS_NONE();
4036

4137
RETURN_STR(intl_error_get_message( NULL ));
4238
}
@@ -50,12 +46,9 @@ PHP_FUNCTION( intl_is_failure )
5046
{
5147
zend_long err_code;
5248

53-
/* Parse parameters. */
54-
if( zend_parse_parameters( ZEND_NUM_ARGS(), "l",
55-
&err_code ) == FAILURE )
56-
{
57-
RETURN_THROWS();
58-
}
49+
ZEND_PARSE_PARAMETERS_START(1, 1)
50+
Z_PARAM_LONG(err_code)
51+
ZEND_PARSE_PARAMETERS_END();
5952

6053
RETURN_BOOL( U_FAILURE( err_code ) );
6154
}
@@ -68,12 +61,9 @@ PHP_FUNCTION( intl_error_name )
6861
{
6962
zend_long err_code;
7063

71-
/* Parse parameters. */
72-
if( zend_parse_parameters( ZEND_NUM_ARGS(), "l",
73-
&err_code ) == FAILURE )
74-
{
75-
RETURN_THROWS();
76-
}
64+
ZEND_PARSE_PARAMETERS_START(1, 1)
65+
Z_PARAM_LONG(err_code)
66+
ZEND_PARSE_PARAMETERS_END();
7767

7868
RETURN_STRING( (char*)u_errorName( err_code ) );
7969
}

0 commit comments

Comments
 (0)