Remove mbfl_strlen call when offset is positive in strpos functions

Author: Girgias

ext/mbstring/tests/mb_strpos.phpt

@@ -11,7 +11,7 @@ include_once('common.inc');
 
 
 // Test string
-$euc_jp = '0123????????????EUC-JP????????0123?????????';
+$euc_jp = '0123この文字列は日本語です。EUC-JPを使っています。0123日本語は面倒臭い。';
 
 $slen = mb_strlen($euc_jp, 'EUC-JP');
 echo "String len: $slen\n";
@@ -21,11 +21,11 @@ mb_internal_encoding('UTF-8') or print("mb_internal_encoding() failed\n");
 
 echo  "== POSITIVE OFFSET ==\n";
 
-print  mb_strpos($euc_jp, '???', 0, 'EUC-JP') . "\n";
+print  mb_strpos($euc_jp, '日本語', 0, 'EUC-JP') . "\n";
 print  mb_strpos($euc_jp, '0', 0,     'EUC-JP') . "\n";
 print  mb_strpos($euc_jp, 3, 0,       'EUC-JP') . "\n";
 print  mb_strpos($euc_jp, 0, 0,       'EUC-JP') . "\n";
-print  mb_strpos($euc_jp, '???', 15, 'EUC-JP') . "\n";
+print  mb_strpos($euc_jp, '日本語', 15, 'EUC-JP') . "\n";
 print  mb_strpos($euc_jp, '0', 15,     'EUC-JP') . "\n";
 print  mb_strpos($euc_jp, 3, 15,       'EUC-JP') . "\n";
 print  mb_strpos($euc_jp, 0, 15,       'EUC-JP') . "\n";
@@ -34,37 +34,17 @@ print  mb_strpos($euc_jp, 0, 15,       'EUC-JP') . "\n";
 // Negative offset
 echo "== NEGATIVE OFFSET ==\n";
 
-print mb_strpos($euc_jp, '???', -15, 'EUC-JP') . "\n";
+print mb_strpos($euc_jp, '日本語', -15, 'EUC-JP') . "\n";
 print mb_strpos($euc_jp, '0', -15,     'EUC-JP') . "\n";
 print mb_strpos($euc_jp, 3, -15,       'EUC-JP') . "\n";
 print mb_strpos($euc_jp, 0, -15,       'EUC-JP') . "\n";
 print mb_strpos($euc_jp, 0, -43,       'EUC-JP') . "\n";
 
-// Out of range - should return false
-print ("== OUT OF RANGE ==\n");
-
-$r =  mb_strpos($euc_jp, '???', 40, 'EUC-JP');
-($r === FALSE) ? print "OK_OUT_RANGE\n"     : print "NG_OUT_RANGE\n";
-$r =  mb_strpos($euc_jp, '0', 40,     'EUC-JP');
-($r === FALSE) ? print "OK_OUT_RANGE\n"     : print "NG_OUT_RANGE\n";
-$r =  mb_strpos($euc_jp, 3, 40,       'EUC-JP');
-($r === FALSE) ? print "OK_OUT_RANGE\n"     : print "NG_OUT_RANGE\n";
-$r =   mb_strpos($euc_jp, 0, 40,       'EUC-JP');
-($r === FALSE) ? print "OK_OUT_RANGE\n"     : print "NG_OUT_RANGE\n";
-$r =  mb_strpos($euc_jp, '???', -3, 'EUC-JP');
-($r === FALSE) ? print "OK_OUT_RANGE\n"     : print "NG_OUT_RANGE\n";
-$r =  mb_strpos($euc_jp, '0', -3,     'EUC-JP');
-($r === FALSE) ? print "OK_OUT_RANGE\n"     : print "NG_OUT_RANGE\n";
-$r =  mb_strpos($euc_jp, 3, -3,       'EUC-JP');
-($r === FALSE) ? print "OK_OUT_RANGE\n"     : print "NG_OUT_RANGE\n";
-$r =   mb_strpos($euc_jp, 0, -3,       'EUC-JP');
-($r === FALSE) ? print "OK_OUT_RANGE\n"     : print "NG_OUT_RANGE\n";
-
 
 // Non-existent
 echo "== NON-EXISTENT ==\n";
 
-$r = mb_strpos($euc_jp, '???', 0, 'EUC-JP');
+$r = mb_strpos($euc_jp, '韓国語', 0, 'EUC-JP');
 ($r === FALSE) ? print "OK_STR\n"     : print "NG_STR\n";
 $r = mb_strpos($euc_jp, "\n",     0, 'EUC-JP');
 ($r === FALSE) ? print "OK_NEWLINE\n" : print "NG_NEWLINE\n";
@@ -75,12 +55,12 @@ echo "== NO ENCODING PARAMETER ==\n";
 
 mb_internal_encoding('EUC-JP')  or print("mb_internal_encoding() failed\n");
 
-print  mb_strpos($euc_jp, '???', 0) . "\n";
+print  mb_strpos($euc_jp, '日本語', 0) . "\n";
 print  mb_strpos($euc_jp, '0', 0) . "\n";
 print  mb_strpos($euc_jp, 3, 0) . "\n";
 print  mb_strpos($euc_jp, 0, 0) . "\n";
 
-$r = mb_strpos($euc_jp, '???', 0);
+$r = mb_strpos($euc_jp, '韓国語', 0);
 ($r === FALSE) ? print "OK_STR\n"     : print "NG_STR\n";
 $r = mb_strpos($euc_jp, "\n", 0);
 ($r === FALSE) ? print "OK_NEWLINE\n" : print "NG_NEWLINE\n";
@@ -90,12 +70,12 @@ echo "== NO OFFSET AND ENCODING PARAMETER ==\n";
 
 mb_internal_encoding('EUC-JP')  or print("mb_internal_encoding() failed\n");
 
-print  mb_strpos($euc_jp, '???') . "\n";
+print  mb_strpos($euc_jp, '日本語') . "\n";
 print  mb_strpos($euc_jp, '0') . "\n";
 print  mb_strpos($euc_jp, 3) . "\n";
 print  mb_strpos($euc_jp, 0) . "\n";
 
-$r = mb_strpos($euc_jp, '???');
+$r = mb_strpos($euc_jp, '韓国語');
 ($r === FALSE) ? print "OK_STR\n"     : print "NG_STR\n";
 $r = mb_strpos($euc_jp, "\n");
 ($r === FALSE) ? print "OK_NEWLINE\n" : print "NG_NEWLINE\n";
@@ -118,15 +98,6 @@ String len: 43
 33
 30
 0
-== OUT OF RANGE ==
-OK_OUT_RANGE
-OK_OUT_RANGE
-OK_OUT_RANGE
-OK_OUT_RANGE
-OK_OUT_RANGE
-OK_OUT_RANGE
-OK_OUT_RANGE
-OK_OUT_RANGE
 == NON-EXISTENT ==
 OK_STR
 OK_NEWLINE