moriyoshi Fri Jul 25 14:04:39 2008 UTC Modified files: /php-src/ext/mbstring mbstring.c php_mbregex.c Log: - Fix warnings http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.290&r2=1.291&diff_format=u Index: php-src/ext/mbstring/mbstring.c diff -u php-src/ext/mbstring/mbstring.c:1.290 php-src/ext/mbstring/mbstring.c:1.291 --- php-src/ext/mbstring/mbstring.c:1.290 Fri Jul 25 13:56:50 2008 +++ php-src/ext/mbstring/mbstring.c Fri Jul 25 14:04:39 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mbstring.c,v 1.290 2008/07/25 13:56:50 moriyoshi Exp $ */ +/* $Id: mbstring.c,v 1.291 2008/07/25 14:04:39 moriyoshi Exp $ */ /* * PHP 4 Multibyte String module "mbstring" @@ -2269,7 +2269,7 @@ RETURN_FALSE; } - if (offset > haystack.len) { + if ((unsigned int)offset > haystack.len) { RETURN_FALSE; } @@ -2677,11 +2677,11 @@ } } - if (from > string.len) { + if ((unsigned int)from > string.len) { RETURN_FALSE; } - if (((unsigned) from + (unsigned) len) > string.len) { + if (((unsigned int)from + (unsigned int)len) > string.len) { len = string.len - from; } @@ -3063,7 +3063,7 @@ } if (ZEND_NUM_ARGS() < 3) { - strict = MBSTRG(strict_detection); + strict = (zend_bool)MBSTRG(strict_detection); } if (size > 0 && list != NULL) { http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/php_mbregex.c?r1=1.63&r2=1.64&diff_format=u Index: php-src/ext/mbstring/php_mbregex.c diff -u php-src/ext/mbstring/php_mbregex.c:1.63 php-src/ext/mbstring/php_mbregex.c:1.64 --- php-src/ext/mbstring/php_mbregex.c:1.63 Thu Jul 17 16:08:08 2008 +++ php-src/ext/mbstring/php_mbregex.c Fri Jul 25 14:04:39 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mbregex.c,v 1.63 2008/07/17 16:08:08 moriyoshi Exp $ */ +/* $Id: php_mbregex.c,v 1.64 2008/07/25 14:04:39 moriyoshi Exp $ */ #ifdef HAVE_CONFIG_H @@ -921,7 +921,7 @@ zval_dtor(&v); } n = regs->end[0]; - if ((size_t)(pos - (OnigUChar *)string) < n) { + if ((pos - (OnigUChar *)string) < n) { pos = (OnigUChar *)string + n; } else { if (pos < string_lim) { @@ -1014,7 +1014,7 @@ } /* add it to the array */ - if (regs->beg[0] < string_len && regs->beg[0] >= (size_t)(pos - (OnigUChar *)string)) { + if (regs->beg[0] < string_len && regs->beg[0] >= (pos - (OnigUChar *)string)) { add_next_index_stringl(return_value, (char *)pos, ((OnigUChar *)(string + regs->beg[0]) - pos), 1); } else { err = -2; @@ -1246,7 +1246,7 @@ { zval **arg_str, **arg_pattern, **arg_options; OnigSyntaxType *syntax = NULL; - int option; + OnigOptionType option; option = MBREX(regex_default_options); syntax = MBREX(regex_default_syntax);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php