Skip to content

Commit 6b88b01

Browse files
committed
Revert "ext/mbstring: voidify php_mb_nls_get_default_detect_order_list()"
This reverts commit 5348a74.
1 parent 5348a74 commit 6b88b01

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

ext/mbstring/mbstring.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -538,20 +538,24 @@ static void _php_mb_free_regex(void *opaque)
538538
}
539539
/* }}} */
540540

541-
static void php_mb_nls_get_default_detect_order_list(enum mbfl_no_language lang, enum mbfl_no_encoding **plist, size_t *plist_size)
541+
/* {{{ php_mb_nls_get_default_detect_order_list */
542+
static int php_mb_nls_get_default_detect_order_list(enum mbfl_no_language lang, enum mbfl_no_encoding **plist, size_t *plist_size)
542543
{
544+
size_t i;
545+
543546
*plist = (enum mbfl_no_encoding *) php_mb_default_identify_list_neut;
544547
*plist_size = sizeof(php_mb_default_identify_list_neut) / sizeof(php_mb_default_identify_list_neut[0]);
545548

546-
for (size_t i = 0; i < sizeof(php_mb_default_identify_list) / sizeof(php_mb_default_identify_list[0]); i++) {
549+
for (i = 0; i < sizeof(php_mb_default_identify_list) / sizeof(php_mb_default_identify_list[0]); i++) {
547550
if (php_mb_default_identify_list[i].lang == lang) {
548551
*plist = (enum mbfl_no_encoding *)php_mb_default_identify_list[i].list;
549552
*plist_size = php_mb_default_identify_list[i].list_size;
550-
return;
553+
return 1;
551554
}
552555
}
553-
ZEND_UNREACHABLE();
556+
return 0;
554557
}
558+
/* }}} */
555559

556560
static char *php_mb_rfc1867_substring_conf(const zend_encoding *encoding, char *start, size_t len, char quote)
557561
{
@@ -854,7 +858,6 @@ static PHP_INI_MH(OnUpdate_mbstring_substitute_character)
854858
MBSTRG(filter_illegal_substchar) = c;
855859
MBSTRG(current_filter_illegal_substchar) = c;
856860
}
857-
// TODO Warn about invalid character?
858861
}
859862
}
860863
} else {

0 commit comments

Comments
 (0)