From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Fri, 25 Jul 2008 14:04:39 +0000 (+0000)
Subject: - Fix warnings
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~1042
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de0e9cea83700385deb066b2e0bdcdb450df3ae9;p=php

- Fix warnings
---

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 93785bdafb..b104b46626 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -2269,7 +2269,7 @@ PHP_FUNCTION(mb_strripos)
 		RETURN_FALSE;
 	}
 
-	if (offset > haystack.len) {
+	if ((unsigned int)offset > haystack.len) {
 		RETURN_FALSE;
 	}
 
@@ -2677,11 +2677,11 @@ PHP_FUNCTION(mb_strcut)
 		}
 	}
 
-	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 @@ PHP_FUNCTION(mb_detect_encoding)
 	}
 
 	if (ZEND_NUM_ARGS() < 3) {
-		strict = MBSTRG(strict_detection);
+		strict = (zend_bool)MBSTRG(strict_detection);
 	}
 
 	if (size > 0 && list != NULL) {
diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c
index c15330346f..6509079fa5 100644
--- a/ext/mbstring/php_mbregex.c
+++ b/ext/mbstring/php_mbregex.c
@@ -921,7 +921,7 @@ static void _php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAMETERS, OnigOp
 				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 @@ PHP_FUNCTION(mb_split)
 		}
 
 		/* 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 @@ PHP_FUNCTION(mb_ereg_search_init)
 {
 	zval **arg_str, **arg_pattern, **arg_options;
 	OnigSyntaxType *syntax = NULL;
-	int option;
+	OnigOptionType option;
 
 	option = MBREX(regex_default_options);
 	syntax = MBREX(regex_default_syntax);