diff options
| author | Máté Kocsis <kocsismate@woohoolabs.com> | 2019-10-29 15:45:46 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-10-30 13:21:40 +0100 |
| commit | 969e7a3c8b7ee3cc51502f1ff1e751ad71fd049c (patch) | |
| tree | d66acb5c6bc0aa0932085f22f7bdc76d59c151c8 /ext/intl/breakiterator/breakiterator_methods.cpp | |
| parent | 5cbe5a538c92d7d515b0270625e2f705a1c02b18 (diff) | |
| download | php-git-969e7a3c8b7ee3cc51502f1ff1e751ad71fd049c.tar.gz | |
Cleanup return values for Intl when parameter parsing is unsuccessful
Closes GH-4871.
Diffstat (limited to 'ext/intl/breakiterator/breakiterator_methods.cpp')
| -rw-r--r-- | ext/intl/breakiterator/breakiterator_methods.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/ext/intl/breakiterator/breakiterator_methods.cpp b/ext/intl/breakiterator/breakiterator_methods.cpp index 84f946bf76..25cd03eeb5 100644 --- a/ext/intl/breakiterator/breakiterator_methods.cpp +++ b/ext/intl/breakiterator/breakiterator_methods.cpp @@ -53,7 +53,7 @@ static void _breakiter_factory(const char *func_name, if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s!", &locale_str, &dummy) == FAILURE) { - RETURN_NULL(); + return; } if (locale_str == NULL) { @@ -113,7 +113,7 @@ U_CFUNC PHP_FUNCTION(breakiter_create_code_point_instance) intl_error_reset(NULL); if (zend_parse_parameters_none() == FAILURE) { - RETURN_NULL(); + return; } CodePointBreakIterator *cpbi = new CodePointBreakIterator(); @@ -126,7 +126,7 @@ U_CFUNC PHP_FUNCTION(breakiter_get_text) object = ZEND_THIS; if (zend_parse_parameters_none() == FAILURE) { - RETURN_FALSE; + return; } BREAKITER_METHOD_FETCH_OBJECT; @@ -146,7 +146,7 @@ U_CFUNC PHP_FUNCTION(breakiter_set_text) object = ZEND_THIS; if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &text) == FAILURE) { - RETURN_FALSE; + return; } BREAKITER_METHOD_FETCH_OBJECT; @@ -178,7 +178,7 @@ static void _breakiter_no_args_ret_int32( object = ZEND_THIS; if (zend_parse_parameters_none() == FAILURE) { - RETURN_FALSE; + return; } BREAKITER_METHOD_FETCH_OBJECT; @@ -199,7 +199,7 @@ static void _breakiter_int32_ret_int32( object = ZEND_THIS; if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &arg) == FAILURE) { - RETURN_FALSE; + return; } BREAKITER_METHOD_FETCH_OBJECT; @@ -273,7 +273,7 @@ U_CFUNC PHP_FUNCTION(breakiter_current) object = ZEND_THIS; if (zend_parse_parameters_none() == FAILURE) { - RETURN_FALSE; + return; } BREAKITER_METHOD_FETCH_OBJECT; @@ -305,7 +305,7 @@ U_CFUNC PHP_FUNCTION(breakiter_is_boundary) if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &offset) == FAILURE) { - RETURN_FALSE; + return; } if (offset < INT32_MIN || offset > INT32_MAX) { @@ -329,7 +329,7 @@ U_CFUNC PHP_FUNCTION(breakiter_get_locale) object = ZEND_THIS; if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &locale_type) == FAILURE) { - RETURN_FALSE; + return; } if (locale_type != ULOC_ACTUAL_LOCALE && locale_type != ULOC_VALID_LOCALE) { @@ -355,7 +355,7 @@ U_CFUNC PHP_FUNCTION(breakiter_get_parts_iterator) object = ZEND_THIS; if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &key_type) == FAILURE) { - RETURN_FALSE; + return; } if (key_type != PARTS_ITERATOR_KEY_SEQUENTIAL @@ -378,7 +378,7 @@ U_CFUNC PHP_FUNCTION(breakiter_get_error_code) object = ZEND_THIS; if (zend_parse_parameters_none() == FAILURE) { - RETURN_FALSE; + return; } /* Fetch the object (without resetting its last error code ). */ @@ -396,7 +396,7 @@ U_CFUNC PHP_FUNCTION(breakiter_get_error_message) object = ZEND_THIS; if (zend_parse_parameters_none() == FAILURE) { - RETURN_FALSE; + return; } |