Remove unneeded function mbfl_name2no_encoding

Author: alexdowad

ext/mbstring/libmbfl/mbfl/mbfl_encoding.c

@@ -212,12 +212,6 @@ const mbfl_encoding *mbfl_no2encoding(enum mbfl_no_encoding no_encoding)
 	return NULL;
 }
 
-enum mbfl_no_encoding mbfl_name2no_encoding(const char *name)
-{
-	const mbfl_encoding *encoding = mbfl_name2encoding(name);
-	return encoding ? encoding->no_encoding : mbfl_no_encoding_invalid;
-}
-
 const char *mbfl_no_encoding2name(enum mbfl_no_encoding no_encoding)
 {
 	const mbfl_encoding *encoding = mbfl_no2encoding(no_encoding);

ext/mbstring/libmbfl/mbfl/mbfl_encoding.h

@@ -248,7 +248,6 @@ static inline zend_string* mb_convert_buf_result(mb_convert_buf *buf, const mbfl
 
 MBFLAPI extern const mbfl_encoding *mbfl_name2encoding(const char *name);
 MBFLAPI extern const mbfl_encoding *mbfl_no2encoding(enum mbfl_no_encoding no_encoding);
-MBFLAPI extern enum mbfl_no_encoding mbfl_name2no_encoding(const char *name);
 MBFLAPI extern const mbfl_encoding **mbfl_get_supported_encodings(void);
 MBFLAPI extern const char *mbfl_no_encoding2name(enum mbfl_no_encoding no_encoding);
 MBFLAPI extern const char *mbfl_no2preferred_mime_name(enum mbfl_no_encoding no_encoding);

ext/mbstring/mbstring.c

@@ -1469,21 +1469,20 @@ PHP_FUNCTION(mb_substitute_character)
 /* {{{ Return the preferred MIME name (charset) as a string */
 PHP_FUNCTION(mb_preferred_mime_name)
 {
-	enum mbfl_no_encoding no_encoding;
 	char *name = NULL;
 	size_t name_len;
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STRING(name, name_len)
 	ZEND_PARSE_PARAMETERS_END();
 
-	no_encoding = mbfl_name2no_encoding(name);
-	if (no_encoding == mbfl_no_encoding_invalid) {
+	const mbfl_encoding *enc = mbfl_name2encoding(name);
+	if (enc == NULL) {
 		zend_argument_value_error(1, "must be a valid encoding, \"%s\" given", name);
 		RETURN_THROWS();
 	}
 
-	const char *preferred_name = mbfl_no2preferred_mime_name(no_encoding);
+	const char *preferred_name = mbfl_encoding_preferred_mime_name(enc);
 	if (preferred_name == NULL || *preferred_name == '\0') {
 		php_error_docref(NULL, E_WARNING, "No MIME preferred name corresponding to \"%s\"", name);
 		RETVAL_FALSE;