Skip to content

Commit 16238d8

Browse files
committed
Switch fix
1 parent 87c04b6 commit 16238d8

File tree

1 file changed

+72
-60
lines changed

1 file changed

+72
-60
lines changed

ext/mbstring/mbstring.c

Lines changed: 72 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -2116,21 +2116,24 @@ PHP_FUNCTION(mb_strpos)
21162116
RETVAL_LONG(n);
21172117
} else {
21182118
switch (-n) {
2119-
case 1:
2120-
/* Returns false */
2121-
break;
2122-
case 2:
2123-
zend_value_error("Needle has not positive length");
2124-
RETURN_THROWS();
2125-
case 4:
2126-
zend_value_error("Unknown encoding or conversion error");
2127-
RETURN_THROWS();
2128-
case 8:
2129-
zend_value_error("Argument is empty");
2130-
RETURN_THROWS();
2131-
default:
2132-
zend_value_error("Unknown error in mb_strpos");
2133-
RETURN_THROWS();
2119+
case 1:
2120+
/* Returns false */
2121+
break;
2122+
case 2:
2123+
zend_value_error("Needle has not positive length");
2124+
RETURN_THROWS();
2125+
case 4:
2126+
zend_value_error("Unknown encoding or conversion error");
2127+
RETURN_THROWS();
2128+
case 8:
2129+
zend_value_error("Argument is empty");
2130+
RETURN_THROWS();
2131+
case: 16:
2132+
zend_value_error("Offset not contained in string");
2133+
RETURN_THROWS();
2134+
default:
2135+
zend_value_error("Unknown error in mb_strripos");
2136+
RETURN_THROWS();
21342137
}
21352138
RETVAL_FALSE;
21362139
}
@@ -2169,21 +2172,24 @@ PHP_FUNCTION(mb_strrpos)
21692172
RETVAL_LONG(n);
21702173
} else {
21712174
switch (-n) {
2172-
case 1:
2173-
/* Returns false */
2174-
break;
2175-
case 2:
2176-
zend_value_error("Needle has not positive length");
2177-
RETURN_THROWS();
2178-
case 4:
2179-
zend_value_error("Unknown encoding or conversion error");
2180-
RETURN_THROWS();
2181-
case 8:
2182-
zend_value_error("Argument is empty");
2183-
RETURN_THROWS();
2184-
default:
2185-
zend_value_error("Unknown error in mb_strrpos");
2186-
RETURN_THROWS();
2175+
case 1:
2176+
/* Returns false */
2177+
break;
2178+
case 2:
2179+
zend_value_error("Needle has not positive length");
2180+
RETURN_THROWS();
2181+
case 4:
2182+
zend_value_error("Unknown encoding or conversion error");
2183+
RETURN_THROWS();
2184+
case 8:
2185+
zend_value_error("Argument is empty");
2186+
RETURN_THROWS();
2187+
case: 16:
2188+
zend_value_error("Offset not contained in string");
2189+
RETURN_THROWS();
2190+
default:
2191+
zend_value_error("Unknown error in mb_strripos");
2192+
RETURN_THROWS();
21872193
}
21882194
RETVAL_FALSE;
21892195
}
@@ -2209,21 +2215,24 @@ PHP_FUNCTION(mb_stripos)
22092215
RETVAL_LONG(n);
22102216
} else {
22112217
switch (-n) {
2212-
case 1:
2213-
/* Returns false */
2214-
break;
2215-
case 2:
2216-
zend_value_error("Needle has not positive length");
2217-
RETURN_THROWS();
2218-
case 4:
2219-
zend_value_error("Unknown encoding or conversion error");
2220-
RETURN_THROWS();
2221-
case 8:
2222-
zend_value_error("Argument is empty");
2223-
RETURN_THROWS();
2224-
default:
2225-
zend_value_error("Unknown error in mb_stripos");
2226-
RETURN_THROWS();
2218+
case 1:
2219+
/* Returns false */
2220+
break;
2221+
case 2:
2222+
zend_value_error("Needle has not positive length");
2223+
RETURN_THROWS();
2224+
case 4:
2225+
zend_value_error("Unknown encoding or conversion error");
2226+
RETURN_THROWS();
2227+
case 8:
2228+
zend_value_error("Argument is empty");
2229+
RETURN_THROWS();
2230+
case: 16:
2231+
zend_value_error("Offset not contained in string");
2232+
RETURN_THROWS();
2233+
default:
2234+
zend_value_error("Unknown error in mb_strripos");
2235+
RETURN_THROWS();
22272236
}
22282237
RETVAL_FALSE;
22292238
}
@@ -2249,21 +2258,24 @@ PHP_FUNCTION(mb_strripos)
22492258
RETVAL_LONG(n);
22502259
} else {
22512260
switch (-n) {
2252-
case 1:
2253-
/* Returns false */
2254-
break;
2255-
case 2:
2256-
zend_value_error("Needle has not positive length");
2257-
RETURN_THROWS();
2258-
case 4:
2259-
zend_value_error("Unknown encoding or conversion error");
2260-
RETURN_THROWS();
2261-
case 8:
2262-
zend_value_error("Argument is empty");
2263-
RETURN_THROWS();
2264-
default:
2265-
zend_value_error("Unknown error in mb_strripos");
2266-
RETURN_THROWS();
2261+
case 1:
2262+
/* Returns false */
2263+
break;
2264+
case 2:
2265+
zend_value_error("Needle has not positive length");
2266+
RETURN_THROWS();
2267+
case 4:
2268+
zend_value_error("Unknown encoding or conversion error");
2269+
RETURN_THROWS();
2270+
case 8:
2271+
zend_value_error("Argument is empty");
2272+
RETURN_THROWS();
2273+
case: 16:
2274+
zend_value_error("Offset not contained in string");
2275+
RETURN_THROWS();
2276+
default:
2277+
zend_value_error("Unknown error in mb_strripos");
2278+
RETURN_THROWS();
22672279
}
22682280
RETVAL_FALSE;
22692281
}

0 commit comments

Comments
 (0)