com php-src: zend_size_t for *.cpp files as wel l: ext/intl/breakiterator/breakiterator_iterators.cpp
ext/intl/breakiterator/breakiterator_methods.cpp ext/i ntl/breakiterator/rulebasedbreakiterator_methods.cpp ext/ intl/calendar/calendar_methods.cpp
ext/intl/calendar/greg oriancalendar_methods.cpp ext/intl/dateformat/dateformat _create.cpp ext/intl/dateformat/dateformat_format_obj ect.cpp
ext/intl/intl_convertcpp.cpp ext/intl/msgform at/msgformat_helper
| From: | Anatol Belski | Date: | Wed, 18 Dec 2013 23:07:30 +0000 |
| Subject: | com php-src: zend_size_t for *.cpp files as wel l: ext/intl/breakiterator/breakiterator_iterators.cpp ext/intl/breakiterator/breakiterator_methods.cpp ext/i ntl/breakiterator/rulebasedbreakiterator_methods.cpp ext/ intl/calendar/calendar_methods.cpp ext/intl/calendar/greg oriancalendar_methods.cpp ext/intl/dateformat/dateformat _create.cpp ext/intl/dateformat/dateformat_format_obj ect.cpp ext/intl/intl_convertcpp.cpp ext/intl/msgform at/msgformat_helper |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74514@lists.php.net to get a copy of this message | ||
Commit: af362b20c6c78f966e76f8523be43284d03d531e
Author: Anatol Belski <ab@php.net> Wed, 18 Dec 2013 15:07:30 -0800
Parents: 8709cc6d600ffaef440b91b27ba1c6ebd4b23c7e
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=af362b20c6c78f966e76f8523be43284d03d531e
Log:
zend_size_t for *.cpp files as well
Changed paths:
M ext/intl/breakiterator/breakiterator_iterators.cpp
M ext/intl/breakiterator/breakiterator_methods.cpp
M ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp
M ext/intl/calendar/calendar_methods.cpp
M ext/intl/calendar/gregoriancalendar_methods.cpp
M ext/intl/dateformat/dateformat_create.cpp
M ext/intl/dateformat/dateformat_format_object.cpp
M ext/intl/intl_convertcpp.cpp
M ext/intl/msgformat/msgformat_helpers.cpp
M ext/intl/timezone/timezone_class.cpp
M ext/intl/timezone/timezone_methods.cpp
diff --git a/ext/intl/breakiterator/breakiterator_iterators.cpp b/ext/intl/breakiterator/breakiterator_iterators.cpp index f8f14d2..cf1ecd2 100644 --- a/ext/intl/breakiterator/breakiterator_iterators.cpp +++ b/ext/intl/breakiterator/breakiterator_iterators.cpp @@ -251,7 +251,7 @@ U_CFUNC zend_object_value IntlPartsIterator_object_create(zend_class_entry *ce T } U_CFUNC zend_function *IntlPartsIterator_get_method(zval **object_ptr, - char *method, zend_str_size_int method_len, const zend_literal *key TSRMLS_DC) + char *method, php_size_t method_len, const zend_literal *key TSRMLS_DC) { zend_literal local_literal = {0}; zend_function *ret; diff --git a/ext/intl/breakiterator/breakiterator_methods.cpp b/ext/intl/breakiterator/breakiterator_methods.cpp index 21a7fcd..3829ad3 100644 --- a/ext/intl/breakiterator/breakiterator_methods.cpp +++ b/ext/intl/breakiterator/breakiterator_methods.cpp @@ -46,7 +46,7 @@ static void _breakiter_factory(const char *func_name, { BreakIterator *biter; const char *locale_str = NULL; - zend_str_size_int dummy; + php_size_t dummy; char *msg; UErrorCode status = UErrorCode(); intl_error_reset(NULL TSRMLS_CC); @@ -149,7 +149,7 @@ U_CFUNC PHP_FUNCTION(breakiter_get_text) U_CFUNC PHP_FUNCTION(breakiter_set_text) { char *text; - zend_str_size_int text_len; + php_size_t text_len; UText *ut = NULL; zval **textzv; BREAKITER_METHOD_INIT_VARS; diff --git a/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp b/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp index 722ac38..0b17ea1 100644 --- a/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp +++ b/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp @@ -33,7 +33,7 @@ static void _php_intlrbbi_constructor_body(INTERNAL_FUNCTION_PARAMETERS) { zval *object = getThis(); char *rules; - zend_str_size_int rules_len; + php_size_t rules_len; zend_bool compiled = 0; UErrorCode status = U_ZERO_ERROR; intl_error_reset(NULL TSRMLS_CC); diff --git a/ext/intl/calendar/calendar_methods.cpp b/ext/intl/calendar/calendar_methods.cpp index cce60e3..47a9acf 100644 --- a/ext/intl/calendar/calendar_methods.cpp +++ b/ext/intl/calendar/calendar_methods.cpp @@ -51,7 +51,7 @@ U_CFUNC PHP_FUNCTION(intlcal_create_instance) { zval **zv_timezone = NULL; const char *locale_str = NULL; - zend_str_size_int dummy; + php_size_t dummy; TimeZone *timeZone; UErrorCode status = U_ZERO_ERROR; intl_error_reset(NULL TSRMLS_CC); @@ -143,7 +143,7 @@ U_CFUNC PHP_FUNCTION(intlcal_get_keyword_values_for_locale) UErrorCode status = U_ZERO_ERROR; char *key, *locale; - zend_str_size_int key_len, + php_size_t key_len, locale_len; zend_bool commonly_used; intl_error_reset(NULL TSRMLS_CC); @@ -1144,7 +1144,7 @@ U_CFUNC PHP_FUNCTION(intlcal_from_date_time) *zv_timestamp = NULL; php_date_obj *datetime; char *locale_str = NULL; - zend_str_size_int locale_str_len; + php_size_t locale_str_len; TimeZone *timeZone; UErrorCode status = U_ZERO_ERROR; Calendar *cal; diff --git a/ext/intl/calendar/gregoriancalendar_methods.cpp b/ext/intl/calendar/gregoriancalendar_methods.cpp index 1d0c110..084b4d1 100644 --- a/ext/intl/calendar/gregoriancalendar_methods.cpp +++ b/ext/intl/calendar/gregoriancalendar_methods.cpp @@ -42,7 +42,7 @@ static void _php_intlgregcal_constructor_body(INTERNAL_FUNCTION_PARAMETERS) zval **args_a[6] = {0}, ***args = &args_a[0]; char *locale = NULL; - zend_str_size_int locale_len; + php_size_t locale_len; php_int_t largs[6]; UErrorCode status = U_ZERO_ERROR; int variant; diff --git a/ext/intl/dateformat/dateformat_create.cpp b/ext/intl/dateformat/dateformat_create.cpp index 54ee6cf..562067f 100644 --- a/ext/intl/dateformat/dateformat_create.cpp +++ b/ext/intl/dateformat/dateformat_create.cpp @@ -41,7 +41,7 @@ static void datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS) zval *object; const char *locale_str; - zend_str_size_int locale_len = 0; + php_size_t locale_len = 0; Locale locale; php_int_t date_type = 0; php_int_t time_type = 0; @@ -53,9 +53,9 @@ static void datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS) TimeZone *timezone = NULL; bool explicit_tz; char* pattern_str = NULL; - zend_str_size_int pattern_str_len = 0; + php_size_t pattern_str_len = 0; UChar* svalue = NULL; /* UTF-16 pattern_str */ - zend_str_size_int slength = 0; + php_size_t slength = 0; IntlDateFormatter_object* dfo; intl_error_reset(NULL TSRMLS_CC); diff --git a/ext/intl/dateformat/dateformat_format_object.cpp b/ext/intl/dateformat/dateformat_format_object.cpp index b00dd74..cf267db 100644 --- a/ext/intl/dateformat/dateformat_format_object.cpp +++ b/ext/intl/dateformat/dateformat_format_object.cpp @@ -63,7 +63,7 @@ U_CFUNC PHP_FUNCTION(datefmt_format_object) zval *object, **format = NULL; const char *locale_str = NULL; - zend_str_size_int locale_len; + php_size_t locale_len; bool pattern = false; UDate date; TimeZone *timeZone = NULL; diff --git a/ext/intl/intl_convertcpp.cpp b/ext/intl/intl_convertcpp.cpp index 5abad5c..f904e8a 100644 --- a/ext/intl/intl_convertcpp.cpp +++ b/ext/intl/intl_convertcpp.cpp @@ -25,7 +25,7 @@ extern "C" { } /* {{{ intl_stringFromChar */ -int intl_stringFromChar(UnicodeString &ret, char *str, zend_str_size_int str_len, UErrorCode *status) +int intl_stringFromChar(UnicodeString &ret, char *str, php_size_t str_len, UErrorCode *status) { //the number of UTF-16 code units is not larger than that of UTF-8 code //units, + 1 for the terminator @@ -51,7 +51,7 @@ int intl_stringFromChar(UnicodeString &ret, char *str, zend_str_size_int str_len * faster than doing intl_convert_utf16_to_utf8(&res, &res_len, * from.getBuffer(), from.length(), &status), * but consumes more memory */ -int intl_charFromString(const UnicodeString &from, char **res, zend_str_size_int *res_len, UErrorCode *status) +int intl_charFromString(const UnicodeString &from, char **res, php_size_t *res_len, UErrorCode *status) { if (from.isBogus()) { return FAILURE; @@ -82,7 +82,7 @@ int intl_charFromString(const UnicodeString &from, char **res, zend_str_size_int return FAILURE; } (*res)[actual_len] = '\0'; - *res_len = (zend_str_size_int)actual_len; + *res_len = (php_size_t)actual_len; return SUCCESS; } diff --git a/ext/intl/msgformat/msgformat_helpers.cpp b/ext/intl/msgformat/msgformat_helpers.cpp index 320b68b..50fd19c 100644 --- a/ext/intl/msgformat/msgformat_helpers.cpp +++ b/ext/intl/msgformat/msgformat_helpers.cpp @@ -391,7 +391,7 @@ U_CFUNC void umsg_format_helper(MessageFormatter_object *mfo, // Key related variables int key_type; char *str_index; - zend_str_size_uint str_len; + php_size_t str_len; php_uint_t num_index; for (zend_hash_internal_pointer_reset_ex(args, &pos); @@ -547,7 +547,7 @@ retry_kint64: double dd = intl_zval_to_millis(*elem, &err, "msgfmt_format" TSRMLS_CC); if (U_FAILURE(err.code)) { char *message, *key_char; - zend_str_size_int key_len; + php_size_t key_len; UErrorCode status = UErrorCode(); if (intl_charFromString(key, &key_char, &key_len, &status) == SUCCESS) { @@ -590,7 +590,7 @@ retry_kint64: default: { char *message, *key_char; - zend_str_size_int key_len; + php_size_t key_len; UErrorCode status = UErrorCode(); if (intl_charFromString(key, &key_char, &key_len, &status) == SUCCESS) { @@ -653,7 +653,7 @@ U_CFUNC void umsg_parse_helper(UMessageFormat *fmt, int *count, zval ***args, UC double aDate; UnicodeString temp; char *stmp; - zend_str_size_int stmp_len; + php_size_t stmp_len; ALLOC_INIT_ZVAL((*args)[i]); diff --git a/ext/intl/timezone/timezone_class.cpp b/ext/intl/timezone/timezone_class.cpp index d9e6115..cb597fd 100644 --- a/ext/intl/timezone/timezone_class.cpp +++ b/ext/intl/timezone/timezone_class.cpp @@ -288,7 +288,7 @@ static HashTable *TimeZone_get_debug_info(zval *object, int *is_temp TSRMLS_DC) const TimeZone *tz; UnicodeString ustr; char *str; - zend_str_size_int str_len; + php_size_t str_len; UErrorCode uec = U_ZERO_ERROR; *is_temp = 1; diff --git a/ext/intl/timezone/timezone_methods.cpp b/ext/intl/timezone/timezone_methods.cpp index 573bd8c..937ae3a 100644 --- a/ext/intl/timezone/timezone_methods.cpp +++ b/ext/intl/timezone/timezone_methods.cpp @@ -47,7 +47,7 @@ U_CFUNC PHP_METHOD(IntlTimeZone, __construct) U_CFUNC PHP_FUNCTION(intltz_create_time_zone) { char *str_id; - zend_str_size_int str_id_len; + php_size_t str_id_len; intl_error_reset(NULL TSRMLS_CC); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", @@ -211,7 +211,7 @@ double_offset: U_CFUNC PHP_FUNCTION(intltz_count_equivalent_ids) { char *str_id; - zend_str_size_int str_id_len; + php_size_t str_id_len; intl_error_reset(NULL TSRMLS_CC); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", @@ -239,7 +239,7 @@ U_CFUNC PHP_FUNCTION(intltz_create_time_zone_id_enumeration) php_int_t zoneType, offset_arg; char *region = NULL; - zend_str_size_int region_len = 0; + php_size_t region_len = 0; int32_t offset, *offsetp = NULL; int arg3isnull = 0; @@ -293,7 +293,7 @@ U_CFUNC PHP_FUNCTION(intltz_create_time_zone_id_enumeration) U_CFUNC PHP_FUNCTION(intltz_get_canonical_id) { char *str_id; - zend_str_size_int str_id_len; + php_size_t str_id_len; zval *is_systemid = NULL; intl_error_reset(NULL TSRMLS_CC); @@ -333,7 +333,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_canonical_id) U_CFUNC PHP_FUNCTION(intltz_get_region) { char *str_id; - zend_str_size_int str_id_len; + php_size_t str_id_len; char outbuf[3]; intl_error_reset(NULL TSRMLS_CC); @@ -380,7 +380,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_tz_data_version) U_CFUNC PHP_FUNCTION(intltz_get_equivalent_id) { char *str_id; - zend_str_size_int str_id_len; + php_size_t str_id_len; php_int_t index; intl_error_reset(NULL TSRMLS_CC); @@ -425,7 +425,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_id) to->utimezone->getID(id_us); char *id = NULL; - zend_str_size_int id_len = 0; + php_size_t id_len = 0; intl_convert_utf16_to_utf8(&id, &id_len, id_us.getBuffer(), id_us.length(), TIMEZONE_ERROR_CODE_P(to)); @@ -537,7 +537,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_display_name) zend_bool daylight = 0; php_int_t display_type = TimeZone::LONG; const char *locale_str = NULL; - zend_str_size_int dummy = 0; + php_size_t dummy = 0; TIMEZONE_METHOD_INIT_VARS; if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
diff --git a/ext/intl/breakiterator/breakiterator_iterators.cpp b/ext/intl/breakiterator/breakiterator_iterators.cpp index f8f14d2..cf1ecd2 100644 --- a/ext/intl/breakiterator/breakiterator_iterators.cpp +++ b/ext/intl/breakiterator/breakiterator_iterators.cpp @@ -251,7 +251,7 @@ U_CFUNC zend_object_value IntlPartsIterator_object_create(zend_class_entry *ce T } U_CFUNC zend_function *IntlPartsIterator_get_method(zval **object_ptr, - char *method, zend_str_size_int method_len, const zend_literal *key TSRMLS_DC) + char *method, php_size_t method_len, const zend_literal *key TSRMLS_DC) { zend_literal local_literal = {0}; zend_function *ret; diff --git a/ext/intl/breakiterator/breakiterator_methods.cpp b/ext/intl/breakiterator/breakiterator_methods.cpp index 21a7fcd..3829ad3 100644 --- a/ext/intl/breakiterator/breakiterator_methods.cpp +++ b/ext/intl/breakiterator/breakiterator_methods.cpp @@ -46,7 +46,7 @@ static void _breakiter_factory(const char *func_name, { BreakIterator *biter; const char *locale_str = NULL; - zend_str_size_int dummy; + php_size_t dummy; char *msg; UErrorCode status = UErrorCode(); intl_error_reset(NULL TSRMLS_CC); @@ -149,7 +149,7 @@ U_CFUNC PHP_FUNCTION(breakiter_get_text) U_CFUNC PHP_FUNCTION(breakiter_set_text) { char *text; - zend_str_size_int text_len; + php_size_t text_len; UText *ut = NULL; zval **textzv; BREAKITER_METHOD_INIT_VARS; diff --git a/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp b/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp index 722ac38..0b17ea1 100644 --- a/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp +++ b/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp @@ -33,7 +33,7 @@ static void _php_intlrbbi_constructor_body(INTERNAL_FUNCTION_PARAMETERS) { zval *object = getThis(); char *rules; - zend_str_size_int rules_len; + php_size_t rules_len; zend_bool compiled = 0; UErrorCode status = U_ZERO_ERROR; intl_error_reset(NULL TSRMLS_CC); diff --git a/ext/intl/calendar/calendar_methods.cpp b/ext/intl/calendar/calendar_methods.cpp index cce60e3..47a9acf 100644 --- a/ext/intl/calendar/calendar_methods.cpp +++ b/ext/intl/calendar/calendar_methods.cpp @@ -51,7 +51,7 @@ U_CFUNC PHP_FUNCTION(intlcal_create_instance) { zval **zv_timezone = NULL; const char *locale_str = NULL; - zend_str_size_int dummy; + php_size_t dummy; TimeZone *timeZone; UErrorCode status = U_ZERO_ERROR; intl_error_reset(NULL TSRMLS_CC); @@ -143,7 +143,7 @@ U_CFUNC PHP_FUNCTION(intlcal_get_keyword_values_for_locale) UErrorCode status = U_ZERO_ERROR; char *key, *locale; - zend_str_size_int key_len, + php_size_t key_len, locale_len; zend_bool commonly_used; intl_error_reset(NULL TSRMLS_CC); @@ -1144,7 +1144,7 @@ U_CFUNC PHP_FUNCTION(intlcal_from_date_time) *zv_timestamp = NULL; php_date_obj *datetime; char *locale_str = NULL; - zend_str_size_int locale_str_len; + php_size_t locale_str_len; TimeZone *timeZone; UErrorCode status = U_ZERO_ERROR; Calendar *cal; diff --git a/ext/intl/calendar/gregoriancalendar_methods.cpp b/ext/intl/calendar/gregoriancalendar_methods.cpp index 1d0c110..084b4d1 100644 --- a/ext/intl/calendar/gregoriancalendar_methods.cpp +++ b/ext/intl/calendar/gregoriancalendar_methods.cpp @@ -42,7 +42,7 @@ static void _php_intlgregcal_constructor_body(INTERNAL_FUNCTION_PARAMETERS) zval **args_a[6] = {0}, ***args = &args_a[0]; char *locale = NULL; - zend_str_size_int locale_len; + php_size_t locale_len; php_int_t largs[6]; UErrorCode status = U_ZERO_ERROR; int variant; diff --git a/ext/intl/dateformat/dateformat_create.cpp b/ext/intl/dateformat/dateformat_create.cpp index 54ee6cf..562067f 100644 --- a/ext/intl/dateformat/dateformat_create.cpp +++ b/ext/intl/dateformat/dateformat_create.cpp @@ -41,7 +41,7 @@ static void datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS) zval *object; const char *locale_str; - zend_str_size_int locale_len = 0; + php_size_t locale_len = 0; Locale locale; php_int_t date_type = 0; php_int_t time_type = 0; @@ -53,9 +53,9 @@ static void datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS) TimeZone *timezone = NULL; bool explicit_tz; char* pattern_str = NULL; - zend_str_size_int pattern_str_len = 0; + php_size_t pattern_str_len = 0; UChar* svalue = NULL; /* UTF-16 pattern_str */ - zend_str_size_int slength = 0; + php_size_t slength = 0; IntlDateFormatter_object* dfo; intl_error_reset(NULL TSRMLS_CC); diff --git a/ext/intl/dateformat/dateformat_format_object.cpp b/ext/intl/dateformat/dateformat_format_object.cpp index b00dd74..cf267db 100644 --- a/ext/intl/dateformat/dateformat_format_object.cpp +++ b/ext/intl/dateformat/dateformat_format_object.cpp @@ -63,7 +63,7 @@ U_CFUNC PHP_FUNCTION(datefmt_format_object) zval *object, **format = NULL; const char *locale_str = NULL; - zend_str_size_int locale_len; + php_size_t locale_len; bool pattern = false; UDate date; TimeZone *timeZone = NULL; diff --git a/ext/intl/intl_convertcpp.cpp b/ext/intl/intl_convertcpp.cpp index 5abad5c..f904e8a 100644 --- a/ext/intl/intl_convertcpp.cpp +++ b/ext/intl/intl_convertcpp.cpp @@ -25,7 +25,7 @@ extern "C" { } /* {{{ intl_stringFromChar */ -int intl_stringFromChar(UnicodeString &ret, char *str, zend_str_size_int str_len, UErrorCode *status) +int intl_stringFromChar(UnicodeString &ret, char *str, php_size_t str_len, UErrorCode *status) { //the number of UTF-16 code units is not larger than that of UTF-8 code //units, + 1 for the terminator @@ -51,7 +51,7 @@ int intl_stringFromChar(UnicodeString &ret, char *str, zend_str_size_int str_len * faster than doing intl_convert_utf16_to_utf8(&res, &res_len, * from.getBuffer(), from.length(), &status), * but consumes more memory */ -int intl_charFromString(const UnicodeString &from, char **res, zend_str_size_int *res_len, UErrorCode *status) +int intl_charFromString(const UnicodeString &from, char **res, php_size_t *res_len, UErrorCode *status) { if (from.isBogus()) { return FAILURE; @@ -82,7 +82,7 @@ int intl_charFromString(const UnicodeString &from, char **res, zend_str_size_int return FAILURE; } (*res)[actual_len] = '\0'; - *res_len = (zend_str_size_int)actual_len; + *res_len = (php_size_t)actual_len; return SUCCESS; } diff --git a/ext/intl/msgformat/msgformat_helpers.cpp b/ext/intl/msgformat/msgformat_helpers.cpp index 320b68b..50fd19c 100644 --- a/ext/intl/msgformat/msgformat_helpers.cpp +++ b/ext/intl/msgformat/msgformat_helpers.cpp @@ -391,7 +391,7 @@ U_CFUNC void umsg_format_helper(MessageFormatter_object *mfo, // Key related variables int key_type; char *str_index; - zend_str_size_uint str_len; + php_size_t str_len; php_uint_t num_index; for (zend_hash_internal_pointer_reset_ex(args, &pos); @@ -547,7 +547,7 @@ retry_kint64: double dd = intl_zval_to_millis(*elem, &err, "msgfmt_format" TSRMLS_CC); if (U_FAILURE(err.code)) { char *message, *key_char; - zend_str_size_int key_len; + php_size_t key_len; UErrorCode status = UErrorCode(); if (intl_charFromString(key, &key_char, &key_len, &status) == SUCCESS) { @@ -590,7 +590,7 @@ retry_kint64: default: { char *message, *key_char; - zend_str_size_int key_len; + php_size_t key_len; UErrorCode status = UErrorCode(); if (intl_charFromString(key, &key_char, &key_len, &status) == SUCCESS) { @@ -653,7 +653,7 @@ U_CFUNC void umsg_parse_helper(UMessageFormat *fmt, int *count, zval ***args, UC double aDate; UnicodeString temp; char *stmp; - zend_str_size_int stmp_len; + php_size_t stmp_len; ALLOC_INIT_ZVAL((*args)[i]); diff --git a/ext/intl/timezone/timezone_class.cpp b/ext/intl/timezone/timezone_class.cpp index d9e6115..cb597fd 100644 --- a/ext/intl/timezone/timezone_class.cpp +++ b/ext/intl/timezone/timezone_class.cpp @@ -288,7 +288,7 @@ static HashTable *TimeZone_get_debug_info(zval *object, int *is_temp TSRMLS_DC) const TimeZone *tz; UnicodeString ustr; char *str; - zend_str_size_int str_len; + php_size_t str_len; UErrorCode uec = U_ZERO_ERROR; *is_temp = 1; diff --git a/ext/intl/timezone/timezone_methods.cpp b/ext/intl/timezone/timezone_methods.cpp index 573bd8c..937ae3a 100644 --- a/ext/intl/timezone/timezone_methods.cpp +++ b/ext/intl/timezone/timezone_methods.cpp @@ -47,7 +47,7 @@ U_CFUNC PHP_METHOD(IntlTimeZone, __construct) U_CFUNC PHP_FUNCTION(intltz_create_time_zone) { char *str_id; - zend_str_size_int str_id_len; + php_size_t str_id_len; intl_error_reset(NULL TSRMLS_CC); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", @@ -211,7 +211,7 @@ double_offset: U_CFUNC PHP_FUNCTION(intltz_count_equivalent_ids) { char *str_id; - zend_str_size_int str_id_len; + php_size_t str_id_len; intl_error_reset(NULL TSRMLS_CC); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", @@ -239,7 +239,7 @@ U_CFUNC PHP_FUNCTION(intltz_create_time_zone_id_enumeration) php_int_t zoneType, offset_arg; char *region = NULL; - zend_str_size_int region_len = 0; + php_size_t region_len = 0; int32_t offset, *offsetp = NULL; int arg3isnull = 0; @@ -293,7 +293,7 @@ U_CFUNC PHP_FUNCTION(intltz_create_time_zone_id_enumeration) U_CFUNC PHP_FUNCTION(intltz_get_canonical_id) { char *str_id; - zend_str_size_int str_id_len; + php_size_t str_id_len; zval *is_systemid = NULL; intl_error_reset(NULL TSRMLS_CC); @@ -333,7 +333,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_canonical_id) U_CFUNC PHP_FUNCTION(intltz_get_region) { char *str_id; - zend_str_size_int str_id_len; + php_size_t str_id_len; char outbuf[3]; intl_error_reset(NULL TSRMLS_CC); @@ -380,7 +380,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_tz_data_version) U_CFUNC PHP_FUNCTION(intltz_get_equivalent_id) { char *str_id; - zend_str_size_int str_id_len; + php_size_t str_id_len; php_int_t index; intl_error_reset(NULL TSRMLS_CC); @@ -425,7 +425,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_id) to->utimezone->getID(id_us); char *id = NULL; - zend_str_size_int id_len = 0; + php_size_t id_len = 0; intl_convert_utf16_to_utf8(&id, &id_len, id_us.getBuffer(), id_us.length(), TIMEZONE_ERROR_CODE_P(to)); @@ -537,7 +537,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_display_name) zend_bool daylight = 0; php_int_t display_type = TimeZone::LONG; const char *locale_str = NULL; - zend_str_size_int dummy = 0; + php_size_t dummy = 0; TIMEZONE_METHOD_INIT_VARS; if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),