com php-src: more fixes to ext/intl: ext/intl/breakiterator/bre akiterator_iterators.cpp ext/intl/intl_convert.c ex t/intl/intl_convert.h
ext/intl/intl_convertcpp.cpp ext/intl/intl_convertcpp.h ext/intl/msgformat/msgformat _helpers.cpp ext/intl/timezone/timezone_class.cpp e
xt/intl/timezone/timezone_methods.cpp

From: Date: Wed, 16 Oct 2013 10:14:20 +0000
Subject: com php-src: more fixes to ext/intl: ext/intl/breakiterator/bre akiterator_iterators.cpp ext/intl/intl_convert.c ex t/intl/intl_convert.h
ext/intl/intl_convertcpp.cpp ext/intl/intl_convertcpp.h ext/intl/msgformat/msgformat _helpers.cpp ext/intl/timezone/timezone_class.cpp e
xt/intl/timezone/timezone_methods.cpp
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-73455@lists.php.net to get a copy of this message
Commit: 52a74bbdd64e03a606e4f6bfc95600362a4d2276 Author: Anatol Belski <ab@php.net> Sat, 24 Aug 2013 07:32:28 -0700 Parents: 05593baf9ac50429bb4b5a0edbfca18e64e33820 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=52a74bbdd64e03a606e4f6bfc95600362a4d2276 Log: more fixes to ext/intl Changed paths: M ext/intl/breakiterator/breakiterator_iterators.cpp M ext/intl/intl_convert.c M ext/intl/intl_convert.h M ext/intl/intl_convertcpp.cpp M ext/intl/intl_convertcpp.h M ext/intl/msgformat/msgformat_helpers.cpp M ext/intl/timezone/timezone_class.cpp M ext/intl/timezone/timezone_methods.cpp Diff: diff --git a/ext/intl/breakiterator/breakiterator_iterators.cpp b/ext/intl/breakiterator/breakiterator_iterators.cpp index da1afb2..f3e22b8 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, int method_len, const zend_literal *key TSRMLS_DC) + char *method, zend_str_size_int method_len, const zend_literal *key TSRMLS_DC) { zend_literal local_literal = {0}; zend_function *ret; diff --git a/ext/intl/intl_convert.c b/ext/intl/intl_convert.c index 92cdc4c...268d4fa 100644 --- a/ext/intl/intl_convert.c +++ b/ext/intl/intl_convert.c @@ -44,8 +44,8 @@ * @return void This function does not return anything. */ void intl_convert_utf8_to_utf16( - UChar** target, int* target_len, - const char* src, int src_len, + UChar** target, zend_str_size_int* target_len, + const char* src, zend_str_size_int src_len, UErrorCode* status ) { UChar* dst_buf = NULL; @@ -108,8 +108,8 @@ void intl_convert_utf8_to_utf16( * @return void This function does not return anything. */ void intl_convert_utf16_to_utf8( - char** target, int* target_len, - const UChar* src, int src_len, + char** target, zend_str_size_int* target_len, + const UChar* src, zend_str_size_int src_len, UErrorCode* status ) { char* dst_buf = NULL; @@ -145,7 +145,7 @@ void intl_convert_utf16_to_utf8( *target = dst_buf; *target_len = dst_len; } -/* }}} */ +/* }}} */ /* * Local variables: diff --git a/ext/intl/intl_convert.h b/ext/intl/intl_convert.h index 3fc03f4..128058f 100644 --- a/ext/intl/intl_convert.h +++ b/ext/intl/intl_convert.h @@ -21,13 +21,13 @@ #include <unicode/ustring.h> void intl_convert_utf8_to_utf16( - UChar** target, int* target_len, - const char* src, int src_len, + UChar** target, zend_str_size_int* target_len, + const char* src, zend_str_size_int src_len, UErrorCode* status ); void intl_convert_utf16_to_utf8( - char** target, int* target_len, - const UChar* src, int src_len, + char** target, zend_str_size_int* target_len, + const UChar* src, zend_str_size_int src_len, UErrorCode* status ); #endif // INTL_CONVERT_H diff --git a/ext/intl/intl_convertcpp.cpp b/ext/intl/intl_convertcpp.cpp index f699a3c..5abad5c 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, int32_t str_len, UErrorCode *status) +int intl_stringFromChar(UnicodeString &ret, char *str, zend_str_size_int 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, int32_t str_len, UErrorCo * 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, int *res_len, UErrorCode *status) +int intl_charFromString(const UnicodeString &from, char **res, zend_str_size_int *res_len, UErrorCode *status) { if (from.isBogus()) { return FAILURE; @@ -82,7 +82,7 @@ int intl_charFromString(const UnicodeString &from, char **res, int *res_len, UEr return FAILURE; } (*res)[actual_len] = '\0'; - *res_len = (int)actual_len; + *res_len = (zend_str_size_int)actual_len; return SUCCESS; } diff --git a/ext/intl/intl_convertcpp.h b/ext/intl/intl_convertcpp.h index 89d4209..4d17492 100644 --- a/ext/intl/intl_convertcpp.h +++ b/ext/intl/intl_convertcpp.h @@ -24,9 +24,12 @@ #endif #include <unicode/unistr.h> +extern "C" { +#include <php.h> +} -int intl_stringFromChar(UnicodeString &ret, char *str, int32_t str_len, UErrorCode *status); +int intl_stringFromChar(UnicodeString &ret, char *str, zend_str_size_int str_len, UErrorCode *status); -int intl_charFromString(const UnicodeString &from, char **res, int *res_len, UErrorCode *status); +int intl_charFromString(const UnicodeString &from, char **res, zend_str_size_int *res_len, UErrorCode *status); #endif /* INTL_CONVERTCPP_H */ diff --git a/ext/intl/msgformat/msgformat_helpers.cpp b/ext/intl/msgformat/msgformat_helpers.cpp index ad855e3..9f9e023 100644 --- a/ext/intl/msgformat/msgformat_helpers.cpp +++ b/ext/intl/msgformat/msgformat_helpers.cpp @@ -388,7 +388,7 @@ U_CFUNC void umsg_format_helper(MessageFormatter_object *mfo, // Key related variables int key_type; char *str_index; - uint str_len; + zend_str_size_uint str_len; ulong num_index; for (zend_hash_internal_pointer_reset_ex(args, &pos); @@ -544,7 +544,7 @@ retry_kint64: double dd = intl_zval_to_millis(*elem, &err, "msgfmt_format" TSRMLS_CC); if (U_FAILURE(err.code)) { char *message, *key_char; - int key_len; + zend_str_size_int key_len; UErrorCode status = UErrorCode(); if (intl_charFromString(key, &key_char, &key_len, &status) == SUCCESS) { @@ -587,7 +587,7 @@ retry_kint64: default: { char *message, *key_char; - int key_len; + zend_str_size_int key_len; UErrorCode status = UErrorCode(); if (intl_charFromString(key, &key_char, &key_len, &status) == SUCCESS) { @@ -650,7 +650,7 @@ U_CFUNC void umsg_parse_helper(UMessageFormat *fmt, int *count, zval ***args, UC double aDate; UnicodeString temp; char *stmp; - int stmp_len; + zend_str_size_int stmp_len; ALLOC_INIT_ZVAL((*args)[i]); diff --git a/ext/intl/timezone/timezone_class.cpp b/ext/intl/timezone/timezone_class.cpp index 1618839..cdccfd1 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; - int str_len; + zend_str_size_int 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 44a089b..680d60a 100644 --- a/ext/intl/timezone/timezone_methods.cpp +++ b/ext/intl/timezone/timezone_methods.cpp @@ -425,7 +425,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_id) to->utimezone->getID(id_us); char *id = NULL; - int id_len = 0; + zend_str_size_int id_len = 0; intl_convert_utf16_to_utf8(&id, &id_len, id_us.getBuffer(), id_us.length(), TIMEZONE_ERROR_CODE_P(to));

« previous php.cvs (#73455) next »