tony2001 Tue Jul 1 07:54:31 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mbstring mbstring.c php_mbregex.c
Log:
string length -> int
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.25.2.10&r2=1.224.2.22.2.25.2.11&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.10
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.11
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.10 Sat Jun 28
21:23:07 2008
+++ php-src/ext/mbstring/mbstring.c Tue Jul 1 07:54:30 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.224.2.22.2.25.2.10 2008/06/28 21:23:07 indeyets Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.25.2.11 2008/07/01 07:54:30 tony2001 Exp $ */
/*
* PHP 4 Multibyte String module "mbstring"
@@ -2108,8 +2108,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) {
@@ -2181,7 +2181,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) {
@@ -2285,7 +2286,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) {
@@ -2428,7 +2430,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;
@@ -2571,7 +2573,7 @@
PHP_FUNCTION(mb_detect_encoding)
{
char *str;
- long str_len;
+ int str_len;
zend_bool strict=0;
zval *encoding_list;
@@ -3189,7 +3191,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();
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/php_mbregex.c?r1=1.53.2.1.2.4.2.5&r2=1.53.2.1.2.4.2.6&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.5
php-src/ext/mbstring/php_mbregex.c:1.53.2.1.2.4.2.6
--- php-src/ext/mbstring/php_mbregex.c:1.53.2.1.2.4.2.5 Sat Jun 28 21:23:07 2008
+++ php-src/ext/mbstring/php_mbregex.c Tue Jul 1 07:54:30 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mbregex.c,v 1.53.2.1.2.4.2.5 2008/06/28 21:23:07 indeyets Exp $ */
+/* $Id: php_mbregex.c,v 1.53.2.1.2.4.2.6 2008/07/01 07:54:30 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
@@ -489,7 +489,7 @@
{
size_t argc = ZEND_NUM_ARGS();
char *encoding;
- long encoding_len;
+ int encoding_len;
OnigEncoding mbctype;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &encoding,
&encoding_len) == FAILURE) {
@@ -946,7 +946,7 @@
{
size_t argc = ZEND_NUM_ARGS();
char *arg_pattern, *arg_options;
- long arg_pattern_len, arg_options_len;
+ int arg_pattern_len, arg_options_len;
int n, i, err, pos, len, beg, end, option;
OnigUChar *str;
OnigSyntaxType *syntax;
@@ -1076,7 +1076,7 @@
size_t argc = ZEND_NUM_ARGS();
zval *arg_str;
char *arg_pattern, *arg_options;
- long arg_pattern_len, arg_options_len;
+ int arg_pattern_len, arg_options_len;
OnigSyntaxType *syntax = NULL;
int option;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
