From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Sat, 13 Sep 2008 00:22:10 +0000 (+0000)
Subject: - mb_encoding_aliases() is more consistent with mb_preferred_mime_name()
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~408
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=23f6c6cf9bf9fe5e7a758604a550927b552fafb1;p=php

- 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 bcc573f5bd..4975f46774 100644
--- 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 0d145a2fc5..1dd10ac196 100644
--- 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);