Skip to content

Commit fdac9bd

Browse files
committed
Drop option_arg_num which now unused
1 parent c0cb689 commit fdac9bd

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

ext/mbstring/php_mbregex.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ static size_t _php_mb_regex_get_option_string(char *str, size_t len, OnigOptionT
592592

593593
/* {{{ _php_mb_regex_init_options */
594594
static bool _php_mb_regex_init_options(const char *parg, size_t narg, OnigOptionType *option,
595-
OnigSyntaxType **syntax, uint32_t option_arg_num)
595+
OnigSyntaxType **syntax)
596596
{
597597
size_t n;
598598
char c;
@@ -1044,7 +1044,7 @@ static void _php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAMETERS, OnigOp
10441044

10451045
if (option_str != NULL) {
10461046
/* Initialize option and in case of failure it means there is a value error */
1047-
if (!_php_mb_regex_init_options(option_str, option_str_len, &options, &syntax, 4)) {
1047+
if (!_php_mb_regex_init_options(option_str, option_str_len, &options, &syntax)) {
10481048
RETURN_THROWS();
10491049
}
10501050
} else {
@@ -1293,7 +1293,7 @@ PHP_FUNCTION(mb_ereg_match)
12931293
}
12941294

12951295
if (option_str != NULL) {
1296-
if(!_php_mb_regex_init_options(option_str, option_str_len, &option, &syntax, 3)) {
1296+
if(!_php_mb_regex_init_options(option_str, option_str_len, &option, &syntax)) {
12971297
RETURN_THROWS();
12981298
}
12991299
} else {
@@ -1348,7 +1348,7 @@ static void _php_mb_regex_ereg_search_exec(INTERNAL_FUNCTION_PARAMETERS, int mod
13481348
}
13491349

13501350
if (arg_options) {
1351-
_php_mb_regex_init_options(arg_options, arg_options_len, &option, &syntax, 2);
1351+
_php_mb_regex_init_options(arg_options, arg_options_len, &option, &syntax);
13521352
} else {
13531353
option |= MBREX(regex_default_options);
13541354
syntax = MBREX(regex_default_syntax);
@@ -1486,7 +1486,7 @@ PHP_FUNCTION(mb_ereg_search_init)
14861486

14871487
if (arg_options) {
14881488
option = 0;
1489-
_php_mb_regex_init_options(arg_options, arg_options_len, &option, &syntax, 3);
1489+
_php_mb_regex_init_options(arg_options, arg_options_len, &option, &syntax);
14901490
} else {
14911491
option = MBREX(regex_default_options);
14921492
syntax = MBREX(regex_default_syntax);
@@ -1629,7 +1629,7 @@ PHP_FUNCTION(mb_regex_set_options)
16291629
if (string != NULL) {
16301630
opt = 0;
16311631
syntax = NULL;
1632-
if(!_php_mb_regex_init_options(string, string_len, &opt, &syntax, 1)) {
1632+
if(!_php_mb_regex_init_options(string, string_len, &opt, &syntax)) {
16331633
RETURN_THROWS();
16341634
}
16351635
_php_mb_regex_set_options(opt, syntax, &prev_opt, &prev_syntax);

0 commit comments

Comments
 (0)