Skip to content

Commit 3da407a

Browse files
committed
Revert "ext/mbstring: voidify php_mb_nls_get_default_detect_order_list()"
This reverts commit 5348a74.
1 parent 72d8660 commit 3da407a

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
@@ -539,20 +539,24 @@ static void _php_mb_free_regex(void *opaque)
539539
}
540540
/* }}} */
541541

542-
static void php_mb_nls_get_default_detect_order_list(enum mbfl_no_language lang, enum mbfl_no_encoding **plist, size_t *plist_size)
542+
/* {{{ php_mb_nls_get_default_detect_order_list */
543+
static int php_mb_nls_get_default_detect_order_list(enum mbfl_no_language lang, enum mbfl_no_encoding **plist, size_t *plist_size)
543544
{
545+
size_t i;
546+
544547
*plist = (enum mbfl_no_encoding *) php_mb_default_identify_list_neut;
545548
*plist_size = sizeof(php_mb_default_identify_list_neut) / sizeof(php_mb_default_identify_list_neut[0]);
546549

547-
for (size_t i = 0; i < sizeof(php_mb_default_identify_list) / sizeof(php_mb_default_identify_list[0]); i++) {
550+
for (i = 0; i < sizeof(php_mb_default_identify_list) / sizeof(php_mb_default_identify_list[0]); i++) {
548551
if (php_mb_default_identify_list[i].lang == lang) {
549552
*plist = (enum mbfl_no_encoding *)php_mb_default_identify_list[i].list;
550553
*plist_size = php_mb_default_identify_list[i].list_size;
551-
return;
554+
return 1;
552555
}
553556
}
554-
ZEND_UNREACHABLE();
557+
return 0;
555558
}
559+
/* }}} */
556560

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

0 commit comments

Comments
 (0)