diff options
Diffstat (limited to 'ext/intl/dateformat/dateformat_attrcpp.cpp')
| -rw-r--r-- | ext/intl/dateformat/dateformat_attrcpp.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/ext/intl/dateformat/dateformat_attrcpp.cpp b/ext/intl/dateformat/dateformat_attrcpp.cpp index 71b136c6c1..52df471a10 100644 --- a/ext/intl/dateformat/dateformat_attrcpp.cpp +++ b/ext/intl/dateformat/dateformat_attrcpp.cpp @@ -48,10 +48,10 @@ U_CFUNC PHP_FUNCTION(datefmt_get_timezone_id) int str_len; DATE_FORMAT_METHOD_INIT_VARS; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &object, IntlDateFormatter_ce_ptr ) == FAILURE) { intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "datefmt_get_timezone_" - "id: unable to parse input params", 0 TSRMLS_CC); + "id: unable to parse input params", 0); RETURN_FALSE; } @@ -76,10 +76,10 @@ U_CFUNC PHP_FUNCTION(datefmt_get_timezone) { DATE_FORMAT_METHOD_INIT_VARS; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &object, IntlDateFormatter_ce_ptr ) == FAILURE) { intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, - "datefmt_get_timezone: unable to parse input params", 0 TSRMLS_CC ); + "datefmt_get_timezone: unable to parse input params", 0 ); RETURN_FALSE; } @@ -90,17 +90,17 @@ U_CFUNC PHP_FUNCTION(datefmt_get_timezone) if (tz_clone == NULL) { intl_errors_set(INTL_DATA_ERROR_P(dfo), U_MEMORY_ALLOCATION_ERROR, "datefmt_get_timezone: Out of memory when cloning time zone", - 0 TSRMLS_CC); + 0); RETURN_FALSE; } object_init_ex(return_value, TimeZone_ce_ptr); - timezone_object_construct(tz_clone, return_value, 1 TSRMLS_CC); + timezone_object_construct(tz_clone, return_value, 1); } U_CFUNC PHP_FUNCTION(datefmt_set_timezone_id) { - php_error_docref0(NULL TSRMLS_CC, E_DEPRECATED, + php_error_docref0(NULL, E_DEPRECATED, "Use datefmt_set_timezone() instead, which also accepts a plain " "time zone identifier and for which this function is now an " "alias"); @@ -119,17 +119,17 @@ U_CFUNC PHP_FUNCTION(datefmt_set_timezone) DATE_FORMAT_METHOD_INIT_VARS; - if ( zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), + if ( zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oz", &object, IntlDateFormatter_ce_ptr, &timezone_zv) == FAILURE) { intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "datefmt_set_timezone: " - "unable to parse input params", 0 TSRMLS_CC); + "unable to parse input params", 0); RETURN_FALSE; } DATE_FORMAT_METHOD_FETCH_OBJECT; timezone = timezone_process_timezone_argument(timezone_zv, - INTL_DATA_ERROR_P(dfo), "datefmt_set_timezone" TSRMLS_CC); + INTL_DATA_ERROR_P(dfo), "datefmt_set_timezone"); if (timezone == NULL) { RETURN_FALSE; } @@ -146,10 +146,10 @@ U_CFUNC PHP_FUNCTION(datefmt_get_calendar) { DATE_FORMAT_METHOD_INIT_VARS; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &object, IntlDateFormatter_ce_ptr ) == FAILURE) { intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, - "datefmt_get_calendar: unable to parse input params", 0 TSRMLS_CC); + "datefmt_get_calendar: unable to parse input params", 0); RETURN_FALSE; } @@ -173,11 +173,11 @@ U_CFUNC PHP_FUNCTION(datefmt_get_calendar_object) { DATE_FORMAT_METHOD_INIT_VARS; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &object, IntlDateFormatter_ce_ptr ) == FAILURE) { intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "datefmt_get_calendar_object: unable to parse input params", - 0 TSRMLS_CC); + 0); RETURN_FALSE; } @@ -192,11 +192,11 @@ U_CFUNC PHP_FUNCTION(datefmt_get_calendar_object) if (cal_clone == NULL) { intl_errors_set(INTL_DATA_ERROR_P(dfo), U_MEMORY_ALLOCATION_ERROR, "datefmt_get_calendar_object: Out of memory when cloning " - "calendar", 0 TSRMLS_CC); + "calendar", 0); RETURN_FALSE; } - calendar_object_create(return_value, cal_clone TSRMLS_CC); + calendar_object_create(return_value, cal_clone); } /* }}} */ @@ -210,10 +210,10 @@ U_CFUNC PHP_FUNCTION(datefmt_set_calendar) zval *calendar_zv; DATE_FORMAT_METHOD_INIT_VARS; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oz", + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oz", &object, IntlDateFormatter_ce_ptr, &calendar_zv) == FAILURE) { intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, - "datefmt_set_calendar: unable to parse input params", 0 TSRMLS_CC); + "datefmt_set_calendar: unable to parse input params", 0); RETURN_FALSE; } @@ -229,7 +229,7 @@ U_CFUNC PHP_FUNCTION(datefmt_set_calendar) if (datefmt_process_calendar_arg(calendar_zv, locale, "datefmt_set_calendar", INTL_DATA_ERROR_P(dfo), cal, cal_type, - cal_owned TSRMLS_CC) == FAILURE) { + cal_owned) == FAILURE) { RETURN_FALSE; } @@ -239,7 +239,7 @@ U_CFUNC PHP_FUNCTION(datefmt_set_calendar) if (old_timezone == NULL) { intl_errors_set(INTL_DATA_ERROR_P(dfo), U_MEMORY_ALLOCATION_ERROR, "datefmt_set_calendar: Out of memory when cloning calendar", - 0 TSRMLS_CC); + 0); delete cal; RETURN_FALSE; } @@ -249,7 +249,7 @@ U_CFUNC PHP_FUNCTION(datefmt_set_calendar) if (cal == NULL) { intl_errors_set(INTL_DATA_ERROR_P(dfo), U_MEMORY_ALLOCATION_ERROR, "datefmt_set_calendar: Out of memory when cloning calendar", - 0 TSRMLS_CC); + 0); RETURN_FALSE; } } |