[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring mbstring.c php_mbregex.c

[Moriyoshi Koizumi]

moriyoshi               Fri Jul 25 14:04:54 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/mbstring       mbstring.c php_mbregex.c 
  Log:
  - MFH: Fix warnings
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.25.2.24&r2=1.224.2.22.2.25.2.25&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.24 
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.25
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.24        Fri Jul 25 
13:57:23 2008
+++ php-src/ext/mbstring/mbstring.c     Fri Jul 25 14:04:54 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: mbstring.c,v 1.224.2.22.2.25.2.24 2008/07/25 13:57:23 moriyoshi Exp $ 
*/
+/* $Id: mbstring.c,v 1.224.2.22.2.25.2.25 2008/07/25 14:04:54 moriyoshi Exp $ 
*/
 
 /*
  * PHP 4 Multibyte String module "mbstring"
@@ -2425,7 +2425,7 @@
                RETURN_FALSE;
        }
 
-       if (offset > haystack.len) {
+       if ((unsigned int)offset > haystack.len) {
                RETURN_FALSE;
        }
 
@@ -2833,11 +2833,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;
        }
 
@@ -3219,7 +3219,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.53.2.1.2.4.2.10&r2=1.53.2.1.2.4.2.11&diff_format=u
Index: php-src/ext/mbstring/php_mbregex.c
diff -u php-src/ext/mbstring/php_mbregex.c:1.53.2.1.2.4.2.10 
php-src/ext/mbstring/php_mbregex.c:1.53.2.1.2.4.2.11
--- php-src/ext/mbstring/php_mbregex.c:1.53.2.1.2.4.2.10        Tue Jul 22 
09:18:30 2008
+++ php-src/ext/mbstring/php_mbregex.c  Fri Jul 25 14:04:54 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_mbregex.c,v 1.53.2.1.2.4.2.10 2008/07/22 09:18:30 moriyoshi Exp $ 
*/
+/* $Id: php_mbregex.c,v 1.53.2.1.2.4.2.11 2008/07/25 14:04:54 moriyoshi Exp $ 
*/
 
 
 #ifdef HAVE_CONFIG_H
@@ -928,7 +928,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) {
@@ -1021,7 +1021,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 @@
        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;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php