Skip to content

Commit 7378713

Browse files
committed
Improve code flow
These nested if-else blocks are unnecessary since we return early.
1 parent 577de17 commit 7378713

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

ext/mbstring/mbstring.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1663,20 +1663,20 @@ PHP_FUNCTION(mb_preferred_mime_name)
16631663

16641664
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name, &name_len) == FAILURE) {
16651665
RETURN_THROWS();
1666+
}
1667+
1668+
no_encoding = mbfl_name2no_encoding(name);
1669+
if (no_encoding == mbfl_no_encoding_invalid) {
1670+
zend_argument_value_error(1, "must be a valid encoding, \"%s\" given", name);
1671+
RETURN_THROWS();
1672+
}
1673+
1674+
const char *preferred_name = mbfl_no2preferred_mime_name(no_encoding);
1675+
if (preferred_name == NULL || *preferred_name == '\0') {
1676+
php_error_docref(NULL, E_WARNING, "No MIME preferred name corresponding to \"%s\"", name);
1677+
RETVAL_FALSE;
16661678
} else {
1667-
no_encoding = mbfl_name2no_encoding(name);
1668-
if (no_encoding == mbfl_no_encoding_invalid) {
1669-
zend_argument_value_error(1, "must be a valid encoding, \"%s\" given", name);
1670-
RETURN_THROWS();
1671-
} else {
1672-
const char *preferred_name = mbfl_no2preferred_mime_name(no_encoding);
1673-
if (preferred_name == NULL || *preferred_name == '\0') {
1674-
php_error_docref(NULL, E_WARNING, "No MIME preferred name corresponding to \"%s\"", name);
1675-
RETVAL_FALSE;
1676-
} else {
1677-
RETVAL_STRING((char *)preferred_name);
1678-
}
1679-
}
1679+
RETVAL_STRING((char *)preferred_name);
16801680
}
16811681
}
16821682
/* }}} */

0 commit comments

Comments
 (0)