clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 18:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

- MFH: Fix warnings

Browse Source
This commit is contained in:
Moriyoshi Koizumi 2008-07-25 14:04:54 +00:00
parent 52d5287d9a
commit 9225429040
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ext/mbstring/mbstring.c
View File

@ -2425,7 +2425,7 @@ PHP_FUNCTION(mb_strripos)
RETURN_FALSE;
}
if (offset > haystack.len) {
if ((unsigned int)offset > haystack.len) {
RETURN_FALSE;
}
@ -2833,11 +2833,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;
}
@ -3219,7 +3219,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) {

6
ext/mbstring/php_mbregex.c
View File

@ -928,7 +928,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) {
@ -1021,7 +1021,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)
char *arg_pattern, *arg_options;
int arg_pattern_len, arg_options_len;
OnigSyntaxType *syntax = NULL;
int option;
OnigOptionType option;
if (zend_parse_parameters(argc TSRMLS_CC, "z|ss", &arg_str, &arg_pattern, &arg_pattern_len, &arg_options, &arg_options_len) == FAILURE) {
return;