- mb_encoding_aliases() is more consistent with mb_preferred_mime_name()

  despite the unconformance with the naming convention.

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index bcc573f5bd87bb284cc284c9ddf9f147177c3a9c..4975f46774f76a44b57d7da80402e0f0e290737f 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -393,7 +393,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_list_encodings, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_list_encoding_aliases, 0, 0, 1)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_encoding_aliases, 0, 0, 1)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
@@ -582,7 +582,7 @@ const zend_function_entry mbstring_functions[] = {
        PHP_FE(mb_convert_encoding,             arginfo_mb_convert_encoding)
        PHP_FE(mb_detect_encoding,              arginfo_mb_detect_encoding)
        PHP_FE(mb_list_encodings,               arginfo_mb_list_encodings)
-       PHP_FE(mb_list_encoding_aliases,                arginfo_mb_list_encoding_aliases)
+       PHP_FE(mb_encoding_aliases,             arginfo_mb_encoding_aliases)
        PHP_FE(mb_convert_kana,                 arginfo_mb_convert_kana)
        PHP_FE(mb_encode_mimeheader,    arginfo_mb_encode_mimeheader)
        PHP_FE(mb_decode_mimeheader,    arginfo_mb_decode_mimeheader)
@@ -3140,9 +3140,9 @@ PHP_FUNCTION(mb_list_encodings)
 }
 /* }}} */
 
-/* {{{ proto array mb_list_encoding_aliases(string encoding)
+/* {{{ proto array mb_encoding_aliases(string encoding)
    Returns an array of the aliases of a given encoding name */
-PHP_FUNCTION(mb_list_encoding_aliases)
+PHP_FUNCTION(mb_encoding_aliases)
 {
        const mbfl_encoding *encoding;
        char *name = NULL;

diff --git a/ext/mbstring/mbstring.h b/ext/mbstring/mbstring.h
index 0d145a2fc5138b252158c863ded6215c349adb0a..1dd10ac196cad065dd4cfc99694caa4c64e711fc 100644 (file)
--- a/ext/mbstring/mbstring.h
+++ b/ext/mbstring/mbstring.h
@@ -117,8 +117,7 @@ PHP_FUNCTION(mb_strimwidth);
 PHP_FUNCTION(mb_convert_encoding);
 PHP_FUNCTION(mb_detect_encoding);
 PHP_FUNCTION(mb_list_encodings);
-PHP_FUNCTION(mb_list_encodings_alias_names);
-PHP_FUNCTION(mb_list_mime_names);
+PHP_FUNCTION(mb_encoding_aliases);
 PHP_FUNCTION(mb_convert_kana);
 PHP_FUNCTION(mb_encode_mimeheader);
 PHP_FUNCTION(mb_decode_mimeheader);