masugata Tue Apr 4 15:14:28 2006 UTC
Modified files:
/php-src/ext/mbstring mbstring.c
Log:
fixed commnet typo, and duplicate logic.
http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/mbstring.c?r1=1.254&r2=1.255&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.254
php-src/ext/mbstring/mbstring.c:1.255
--- php-src/ext/mbstring/mbstring.c:1.254 Mon Apr 3 15:32:43 2006
+++ php-src/ext/mbstring/mbstring.c Tue Apr 4 15:14:28 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.254 2006/04/03 15:32:43 masugata Exp $ */
+/* $Id: mbstring.c,v 1.255 2006/04/04 15:14:28 masugata Exp $ */
/*
* PHP 4 Multibyte String module "mbstring"
@@ -1640,7 +1640,7 @@
/* }}} */
/* {{{ proto int mb_strrpos(string haystack, string needle [, string encoding])
- Find the last occurrence of a character in a string within another */
+ Find position of last occurrence of a string within another */
PHP_FUNCTION(mb_strrpos)
{
int n;
@@ -1741,7 +1741,7 @@
PHP_FUNCTION(mb_strstr)
{
int n, len, mblen;
- mbfl_string haystack, needle, result, *ret = NULL;;
+ mbfl_string haystack, needle, result, *ret = NULL;
char *enc_name = NULL;
int enc_name_len;
zend_bool part = 0;
@@ -1775,8 +1775,8 @@
}
n = mbfl_strpos(&haystack, &needle, 0, 0);
if (n >= 0) {
+ mblen = mbfl_strlen(&haystack);
if (part) {
- mblen = mbfl_strlen(&haystack);
ret = mbfl_substr(&haystack, &result, 0, n);
if (ret != NULL) {
RETVAL_STRINGL((char *)ret->val, ret->len, 0);
@@ -1784,7 +1784,6 @@
RETVAL_FALSE;
}
} else {
- mblen = mbfl_strlen(&haystack);
len = (mblen - n);
ret = mbfl_substr(&haystack, &result, n, len);
if (ret != NULL) {
@@ -1804,7 +1803,7 @@
PHP_FUNCTION(mb_strrchr)
{
int n, len, mblen;
- mbfl_string haystack, needle, result, *ret = NULL;;
+ mbfl_string haystack, needle, result, *ret = NULL;
char *enc_name = NULL;
int enc_name_len;
zend_bool part = 0;
@@ -1838,8 +1837,8 @@
}
n = mbfl_strpos(&haystack, &needle, 0, 1);
if (n >= 0) {
+ mblen = mbfl_strlen(&haystack);
if (part) {
- mblen = mbfl_strlen(&haystack);
ret = mbfl_substr(&haystack, &result, 0, n);
if (ret != NULL) {
RETVAL_STRINGL((char *)ret->val, ret->len, 0);
@@ -1847,7 +1846,6 @@
RETVAL_FALSE;
}
} else {
- mblen = mbfl_strlen(&haystack);
len = (mblen - n);
ret = mbfl_substr(&haystack, &result, n, len);
if (ret != NULL) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
