diff options
Diffstat (limited to 'ext/intl/grapheme/grapheme_string.c')
| -rw-r--r-- | ext/intl/grapheme/grapheme_string.c | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/ext/intl/grapheme/grapheme_string.c b/ext/intl/grapheme/grapheme_string.c index 5caacb4f28..55ce63955f 100644 --- a/ext/intl/grapheme/grapheme_string.c +++ b/ext/intl/grapheme/grapheme_string.c @@ -50,12 +50,12 @@ void grapheme_register_constants( INIT_FUNC_ARGS ) } /* }}} */ -/* {{{ proto int grapheme_strlen(string str) +/* {{{ proto size_t grapheme_strlen(string str) Get number of graphemes in a string */ PHP_FUNCTION(grapheme_strlen) { unsigned char* string; - int string_len; + size_t string_len; UChar* ustring = NULL; int ustring_len = 0; int ret_len; @@ -109,9 +109,9 @@ PHP_FUNCTION(grapheme_strlen) PHP_FUNCTION(grapheme_strpos) { unsigned char *haystack, *needle; - int haystack_len, needle_len; + size_t haystack_len, needle_len; unsigned char *found; - long loffset = 0; + zend_long loffset = 0; int32_t offset = 0; int ret_pos; @@ -176,9 +176,9 @@ PHP_FUNCTION(grapheme_strpos) PHP_FUNCTION(grapheme_stripos) { unsigned char *haystack, *needle, *haystack_dup, *needle_dup; - int haystack_len, needle_len; + size_t haystack_len, needle_len; unsigned char *found; - long loffset = 0; + zend_long loffset = 0; int32_t offset = 0; int ret_pos; int is_ascii; @@ -251,8 +251,8 @@ PHP_FUNCTION(grapheme_stripos) PHP_FUNCTION(grapheme_strrpos) { unsigned char *haystack, *needle; - int haystack_len, needle_len; - long loffset = 0; + size_t haystack_len, needle_len; + zend_long loffset = 0; int32_t offset = 0; int32_t ret_pos; int is_ascii; @@ -321,8 +321,8 @@ PHP_FUNCTION(grapheme_strrpos) PHP_FUNCTION(grapheme_strripos) { unsigned char *haystack, *needle; - int haystack_len, needle_len; - long loffset = 0; + size_t haystack_len, needle_len; + zend_long loffset = 0; int32_t offset = 0; int32_t ret_pos; int is_ascii; @@ -400,8 +400,10 @@ PHP_FUNCTION(grapheme_substr) { unsigned char *str, *sub_str; UChar *ustr; - int str_len, sub_str_len, ustr_len; - long lstart = 0, length = 0; + size_t str_len; + int32_t ustr_len; + int32_t sub_str_len; + zend_long lstart = 0, length = 0; int32_t start = 0; int iter_val; UErrorCode status; @@ -618,7 +620,7 @@ PHP_FUNCTION(grapheme_substr) static void strstr_common_handler(INTERNAL_FUNCTION_PARAMETERS, int f_ignore_case) { unsigned char *haystack, *needle, *found; - int haystack_len, needle_len; + size_t haystack_len, needle_len; int ret_pos, uchar_pos; zend_bool part = 0; @@ -815,11 +817,12 @@ PHP_FUNCTION(grapheme_extract) { unsigned char *str, *pstr; UChar *ustr; - int str_len, ustr_len; - long size; /* maximum number of grapheme clusters, bytes, or characters (based on extract_type) to return */ - long lstart = 0; /* starting position in str in bytes */ + size_t str_len; + int32_t ustr_len; + zend_long size; /* maximum number of grapheme clusters, bytes, or characters (based on extract_type) to return */ + zend_long lstart = 0; /* starting position in str in bytes */ int32_t start = 0; - long extract_type = GRAPHEME_EXTRACT_TYPE_COUNT; + zend_long extract_type = GRAPHEME_EXTRACT_TYPE_COUNT; UErrorCode status; unsigned char u_break_iterator_buffer[U_BRK_SAFECLONE_BUFFERSIZE]; UBreakIterator* bi = NULL; @@ -898,7 +901,7 @@ PHP_FUNCTION(grapheme_extract) */ if ( -1 != grapheme_ascii_check(pstr, size + 1 < str_len ? size + 1 : str_len ) ) { - long nsize = ( size < str_len ? size : str_len ); + zend_long nsize = ( size < str_len ? size : str_len ); if ( NULL != next ) { ZVAL_LONG(next, start+nsize); } |