archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

eliminate usage of deprecated zend_get_parameters_ex

Browse source
This commit is contained in:
Stanislav Malyshev 2014-12-28 23:46:42 -08:00
parent b946621333
commit 78d7ad27e2
1 changed files with 8 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

19
ext/intl/timezone/timezone_methods.cpp
View file

@ -240,18 +240,12 @@ U_CFUNC PHP_FUNCTION(intltz_create_time_zone_id_enumeration)
size_t region_len = 0; size_t region_len = 0;
int32_t offset, int32_t offset,
*offsetp = NULL; *offsetp = NULL;
int arg3isnull = 0; zend_bool arg3isnull = 1;
intl_error_reset(NULL); intl_error_reset(NULL);
/* must come before zpp because zpp would convert the arg in the stack to 0 */ if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|s!l!",
if (ZEND_NUM_ARGS() == 3) { &zoneType, &region, &region_len, &offset_arg, &arg3isnull) == FAILURE) {
zval *dummy, *zvoffset;
arg3isnull = zend_get_parameters_ex(3, &dummy, &dummy, &zvoffset)
!= FAILURE && Z_TYPE_P(zvoffset) == IS_NULL;
}
if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|s!l",
&zoneType, &region, &region_len, &offset_arg) == FAILURE) {
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
"intltz_create_time_zone_id_enumeration: bad arguments", 0); "intltz_create_time_zone_id_enumeration: bad arguments", 0);
RETURN_FALSE; RETURN_FALSE;
@ -264,18 +258,15 @@ U_CFUNC PHP_FUNCTION(intltz_create_time_zone_id_enumeration)
RETURN_FALSE; RETURN_FALSE;
} }
if (ZEND_NUM_ARGS() == 3) { if (!arg3isnull) {
if (offset_arg < (zend_long)INT32_MIN || offset_arg > (zend_long)INT32_MAX) { if (offset_arg < (zend_long)INT32_MIN || offset_arg > (zend_long)INT32_MAX) {
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
"intltz_create_time_zone_id_enumeration: offset out of bounds", 0); "intltz_create_time_zone_id_enumeration: offset out of bounds", 0);
RETURN_FALSE; RETURN_FALSE;
} }
if (!arg3isnull) {
offset = (int32_t)offset_arg; offset = (int32_t)offset_arg;
offsetp = &offset; offsetp = &offset;
} //else leave offsetp NULL } //else leave offsetp NULL
}
StringEnumeration *se; StringEnumeration *se;
UErrorCode uec = UErrorCode(); UErrorCode uec = UErrorCode();