diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-12-29 02:17:15 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-12-29 14:06:12 -0800 |
| commit | 82f3d3658315513bdb8136371c6b46ea6297eb22 (patch) | |
| tree | 6bdee5087d8b5a0c75db0ece8e20189cacfc090a /ext/intl/transliterator | |
| parent | ee7decb7ff7b8e81b595c01cfb6b5719bb8c520e (diff) | |
| download | php-git-82f3d3658315513bdb8136371c6b46ea6297eb22.tar.gz | |
cleanup intl types
Diffstat (limited to 'ext/intl/transliterator')
| -rw-r--r-- | ext/intl/transliterator/transliterator_class.c | 2 | ||||
| -rw-r--r-- | ext/intl/transliterator/transliterator_methods.c | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/ext/intl/transliterator/transliterator_class.c b/ext/intl/transliterator/transliterator_class.c index 4b799d1802..c40c5e33ce 100644 --- a/ext/intl/transliterator/transliterator_class.c +++ b/ext/intl/transliterator/transliterator_class.c @@ -37,7 +37,7 @@ int transliterator_object_construct( zval *object, const UChar *ustr_id; int32_t ustr_id_len; char *str_id; - int str_id_len; + size_t str_id_len; Transliterator_object *to; TRANSLITERATOR_METHOD_FETCH_OBJECT_NO_CHECK; diff --git a/ext/intl/transliterator/transliterator_methods.c b/ext/intl/transliterator/transliterator_methods.c index 66db8bf522..22c608c9d4 100644 --- a/ext/intl/transliterator/transliterator_methods.c +++ b/ext/intl/transliterator/transliterator_methods.c @@ -27,7 +27,7 @@ #include <zend_exceptions.h> -static int create_transliterator( char *str_id, int str_id_len, zend_long direction, zval *object ) +static int create_transliterator( char *str_id, size_t str_id_len, zend_long direction, zval *object ) { Transliterator_object *to; UChar *ustr_id = NULL; @@ -103,9 +103,9 @@ static int create_transliterator( char *str_id, int str_id_len, zend_long direct */ PHP_FUNCTION( transliterator_create ) { - char *str_id; - size_t str_id_len; - zend_long direction = TRANSLITERATOR_FORWARD; + char *str_id; + size_t str_id_len; + zend_long direction = TRANSLITERATOR_FORWARD; int res; TRANSLITERATOR_METHOD_INIT_VARS; @@ -136,10 +136,10 @@ PHP_FUNCTION( transliterator_create ) PHP_FUNCTION( transliterator_create_from_rules ) { char *str_rules; - size_t str_rules_len; + size_t str_rules_len; UChar *ustr_rules = NULL; int32_t ustr_rules_len = 0; - zend_long direction = TRANSLITERATOR_FORWARD; + zend_long direction = TRANSLITERATOR_FORWARD; UParseError parse_error = {0, -1}; UTransliterator *utrans; UChar id[] = {0x52, 0x75, 0x6C, 0x65, 0x73, 0x54, 0x72, @@ -266,7 +266,7 @@ PHP_FUNCTION( transliterator_list_ids ) while( (elem = uenum_unext( en, &elem_len, &status )) ) { char *el_char = NULL; - int el_len = 0; + size_t el_len = 0; intl_convert_utf16_to_utf8( &el_char, &el_len, elem, elem_len, &status ); @@ -303,11 +303,11 @@ PHP_FUNCTION( transliterator_transliterate ) char *str; UChar *ustr = NULL, *uresult = NULL; - size_t str_len; + size_t str_len; int32_t ustr_len = 0, capacity, uresult_len; - zend_long start = 0, + zend_long start = 0, limit = -1; int success = 0; zval tmp_object; |