diff options
| author | George Peter Banyard <girgias@php.net> | 2020-06-05 19:01:13 +0200 |
|---|---|---|
| committer | George Peter Banyard <girgias@php.net> | 2020-06-05 22:16:33 +0200 |
| commit | 4c6ecc820bfcdd0d978425851c5b2589e6858c97 (patch) | |
| tree | 3248b2b9920afbc864efb83295c9c68027bcc7a8 /ext/intl/breakiterator/breakiterator_methods.cpp | |
| parent | 7af04660447768c81b5df3f4642a786aa6c6ca68 (diff) | |
| download | php-git-4c6ecc820bfcdd0d978425851c5b2589e6858c97.tar.gz | |
Refactor IntlBreakIterator::next() handling
Diffstat (limited to 'ext/intl/breakiterator/breakiterator_methods.cpp')
| -rw-r--r-- | ext/intl/breakiterator/breakiterator_methods.cpp | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/ext/intl/breakiterator/breakiterator_methods.cpp b/ext/intl/breakiterator/breakiterator_methods.cpp index 4aecfc4f78..7e920fa39c 100644 --- a/ext/intl/breakiterator/breakiterator_methods.cpp +++ b/ext/intl/breakiterator/breakiterator_methods.cpp @@ -240,23 +240,18 @@ U_CFUNC PHP_METHOD(IntlBreakIterator, previous) U_CFUNC PHP_METHOD(IntlBreakIterator, next) { - bool no_arg_version = false; + zval *arg = NULL; if (ZEND_NUM_ARGS() == 0) { - no_arg_version = true; - } else if (ZEND_NUM_ARGS() == 1) { - zval *arg; - int res = zend_parse_parameters(ZEND_NUM_ARGS(), "z", &arg); - assert(res == SUCCESS); - if (Z_TYPE_P(arg) == IS_NULL) { - no_arg_version = true; - ZEND_NUM_ARGS() = 0; /* pretend we don't have any argument */ - } else { - no_arg_version = false; - } + goto no_arg_version; + } + if (zend_parse_parameters(ZEND_NUM_ARGS(), "z!", &arg) == FAILURE) { + RETURN_THROWS(); } - if (no_arg_version) { + if (arg == NULL) { + ZEND_NUM_ARGS() = 0; /* pretend we don't have any argument */ + no_arg_version: _breakiter_no_args_ret_int32("breakiter_next", &BreakIterator::next, INTERNAL_FUNCTION_PARAM_PASSTHRU); |