[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard string.c /ext/standard/tests/strings strings001.phpt

[Antony Dovgal]

tony2001                Tue Aug  8 10:22:26 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/standard       string.c 
    /php-src/ext/standard/tests/strings strings001.phpt 
  Log:
  use memrchr/zend_memrchr instead of strrchr
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.9&r2=1.445.2.14.2.10&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.9 
php-src/ext/standard/string.c:1.445.2.14.2.10
--- php-src/ext/standard/string.c:1.445.2.14.2.9        Fri Jul 28 12:23:18 2006
+++ php-src/ext/standard/string.c       Tue Aug  8 10:22:25 2006
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: string.c,v 1.445.2.14.2.9 2006/07/28 12:23:18 tony2001 Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.10 2006/08/08 10:22:25 tony2001 Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -1382,7 +1382,7 @@
                        php_basename(path, path_len, NULL, 0, &ret, &ret_len 
TSRMLS_CC);
                }
 
-               p = strrchr(ret, '.');
+               p = zend_memrchr(ret, '.', ret_len);
 
                if (p) {
                        idx = p - ret;
@@ -1399,7 +1399,7 @@
                        php_basename(path, path_len, NULL, 0, &ret, &ret_len 
TSRMLS_CC);
                }
 
-               p = strrchr(ret, '.');
+               p = zend_memrchr(ret, '.', ret_len);
 
                idx = p ? (p - ret) : ret_len;
                add_assoc_stringl(tmp, "filename", ret, idx, 1);
@@ -1871,10 +1871,10 @@
        convert_to_string_ex(haystack);
 
        if (Z_TYPE_PP(needle) == IS_STRING) {
-               found = strrchr(Z_STRVAL_PP(haystack), *Z_STRVAL_PP(needle));
+               found = zend_memrchr(Z_STRVAL_PP(haystack), 
*Z_STRVAL_PP(needle), Z_STRLEN_PP(haystack));
        } else {
                convert_to_long_ex(needle);
-               found = strrchr(Z_STRVAL_PP(haystack), (char) 
Z_LVAL_PP(needle));
+               found = zend_memrchr(Z_STRVAL_PP(haystack), (char) 
Z_LVAL_PP(needle), Z_STRLEN_PP(haystack));
        }
 
        if (found) {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strings001.phpt?r1=1.2&r2=1.2.20.1&diff_format=u
Index: php-src/ext/standard/tests/strings/strings001.phpt
diff -u php-src/ext/standard/tests/strings/strings001.phpt:1.2 
php-src/ext/standard/tests/strings/strings001.phpt:1.2.20.1
--- php-src/ext/standard/tests/strings/strings001.phpt:1.2      Sat Oct 26 
20:07:49 2002
+++ php-src/ext/standard/tests/strings/strings001.phpt  Tue Aug  8 10:22:25 2006
@@ -9,4 +9,4 @@
 ?>
 --EXPECTREGEX--
 string\(18\) \"nica\x00turska panica\"
-string\(19\) \" nica\x00turska panica\"
+string\(7\) \" panica\"

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