[PHP-CVS] cvs: php-src /ext/mbstring mbstring.c

[Alexey Zakhlestin]

indeyets                Mon Jul  7 10:00:31 2008 UTC

  Modified files:              
    /php-src/ext/mbstring       mbstring.c 
  Log:
  MFB: string length -> int
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.279&r2=1.280&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.279 
php-src/ext/mbstring/mbstring.c:1.280
--- php-src/ext/mbstring/mbstring.c:1.279       Mon Jul  7 09:57:12 2008
+++ php-src/ext/mbstring/mbstring.c     Mon Jul  7 10:00:30 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: mbstring.c,v 1.279 2008/07/07 09:57:12 indeyets Exp $ */
+/* $Id: mbstring.c,v 1.280 2008/07/07 10:00:30 indeyets Exp $ */
 
 /*
  * PHP 4 Multibyte String module "mbstring"
@@ -2099,8 +2099,8 @@
 {
        size_t argc = ZEND_NUM_ARGS();
        char *str, *encoding;
-       long str_len, from, len, encoding_len;
-       int mblen;
+       long from, len;
+       int mblen, str_len, encoding_len;
        mbfl_string string, result, *ret;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl|ls", &str, 
&str_len, &from, &len, &encoding, &encoding_len) == FAILURE) {
@@ -2172,7 +2172,8 @@
 {
        size_t argc = ZEND_NUM_ARGS();
        char *str, *encoding;
-       long str_len, from, len, encoding_len;
+       long from, len;
+       int str_len, encoding_len;
        mbfl_string string, result, *ret;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl|ls", &str, 
&str_len, &from, &len, &encoding, &encoding_len) == FAILURE) {
@@ -2276,7 +2277,8 @@
 {
        zval **arg1, **arg2, **arg3, **arg4, **arg5;
        char *str, *trimmarker, *encoding;
-       long str_len, from, width, trimmarker_len, encoding_len;
+       long from, width;
+       int str_len, trimmarker_len, encoding_len;
        mbfl_string string, result, marker, *ret;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sll|ss", &str, 
&str_len, &from, &width, &trimmarker, &trimmarker_len, &encoding, 
&encoding_len) == FAILURE) {
@@ -2419,7 +2421,7 @@
 PHP_FUNCTION(mb_convert_encoding)
 {
        char *arg_str, *arg_new;
-       long str_len, new_len;
+       int str_len, new_len;
        zval *arg_old;
        int i;
        size_t size, l, n;
@@ -2562,7 +2564,7 @@
 PHP_FUNCTION(mb_detect_encoding)
 {
        char *str;
-       long str_len;
+       int str_len;
        zend_bool strict=0;
        zval *encoding_list;
 
@@ -3202,7 +3204,7 @@
 php_mb_numericentity_exec(INTERNAL_FUNCTION_PARAMETERS, int type)
 {
        char *str, *encoding;
-       long str_len, encoding_len;
+       int str_len, encoding_len;
        zval *zconvmap, **hash_entry;
        HashTable *target_hash;
        size_t argc = ZEND_NUM_ARGS();



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