tony2001 Fri Jan 12 12:06:34 2007 UTC
Modified files:
/php-src/ext/mbstring mbstring.c
Log:
fix folding and ws
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.265&r2=1.266&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.265
php-src/ext/mbstring/mbstring.c:1.266
--- php-src/ext/mbstring/mbstring.c:1.265 Mon Jan 1 09:29:25 2007
+++ php-src/ext/mbstring/mbstring.c Fri Jan 12 12:06:33 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.265 2007/01/01 09:29:25 sebastian Exp $ */
+/* $Id: mbstring.c,v 1.266 2007/01/12 12:06:33 tony2001 Exp $ */
/*
* PHP 4 Multibyte String module "mbstring"
@@ -1740,7 +1740,7 @@
RETURN_FALSE;
}
- n = php_mb_stripos(0, old_haystack, old_haystack_len, old_needle,
old_needle_len, offset, from_encoding TSRMLS_CC);
+ n = php_mb_stripos(0, old_haystack, old_haystack_len, old_needle,
old_needle_len, offset, from_encoding TSRMLS_CC);
if (n >= 0) {
RETVAL_LONG(n);
@@ -1770,7 +1770,7 @@
RETURN_FALSE;
}
- n = php_mb_stripos(1, old_haystack, old_haystack_len, old_needle,
old_needle_len, offset, from_encoding TSRMLS_CC);
+ n = php_mb_stripos(1, old_haystack, old_haystack_len, old_needle,
old_needle_len, offset, from_encoding TSRMLS_CC);
if (n >= 0) {
RETVAL_LONG(n);
@@ -1954,6 +1954,7 @@
}
}
}
+/* }}} */
/* {{{ proto string mb_strrichr(string haystack, string needle[, bool part[,
string encoding]])
Finds the last occurrence of a character in a string within another, case
insensitive */
@@ -1981,7 +1982,7 @@
RETURN_FALSE;
}
- n = php_mb_stripos(1, haystack.val, haystack.len, needle.val, needle.len, 0,
from_encoding TSRMLS_CC);
+ n = php_mb_stripos(1, haystack.val, haystack.len, needle.val,
needle.len, 0, from_encoding TSRMLS_CC);
if (n <0) {
RETURN_FALSE;
@@ -2006,6 +2007,7 @@
}
}
}
+/* }}} */
/* {{{ proto int mb_substr_count(string haystack, string needle [, string
encoding])
Count the number of substring occurrences */
@@ -4252,6 +4254,7 @@
return ret ? 0 : -1;
}
+/* }}} */
/* {{{ MBSTRING_API int php_mb_gpc_encoding_detector()
*/
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
