Removed redundant aliases & CS fix.

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index b612d9136cec908d10042396f7d77586047585e8..7c0c3de2d687a64fe5c93bef3543ec8b90e4e23a 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -188,49 +188,36 @@ const struct def_mbctype_tbl mbctype_tbl[] = {
 
 /* {{{ function_entry mbstring_functions[] */
 function_entry mbstring_functions[] = {
-       PHP_FE(mb_convert_case,                         NULL)
-       PHP_FE(mb_strtoupper,                           NULL)
-       PHP_FE(mb_strtolower,                           NULL)
-       PHP_FE(mb_language,                                     NULL)
-       PHP_FE(mb_internal_encoding,            NULL)
-       PHP_FE(mb_http_input,                           NULL)
+       PHP_FE(mb_convert_case,                 NULL)
+       PHP_FE(mb_strtoupper,                   NULL)
+       PHP_FE(mb_strtolower,                   NULL)
+       PHP_FE(mb_language,                             NULL)
+       PHP_FE(mb_internal_encoding,    NULL)
+       PHP_FE(mb_http_input,                   NULL)
        PHP_FE(mb_http_output,                  NULL)
        PHP_FE(mb_detect_order,                 NULL)
        PHP_FE(mb_substitute_character, NULL)
        PHP_FE(mb_parse_str,                    (unsigned char *)second_args_force_ref)
-       PHP_FE(mb_output_handler,                       NULL)
+       PHP_FE(mb_output_handler,               NULL)
        PHP_FE(mb_preferred_mime_name,  NULL)
-       PHP_FE(mb_strlen,                                       NULL)
-       PHP_FE(mb_strpos,                                       NULL)
+       PHP_FE(mb_strlen,                               NULL)
+       PHP_FE(mb_strpos,                               NULL)
        PHP_FE(mb_strrpos,                              NULL)
        PHP_FE(mb_substr_count,                 NULL)
-       PHP_FE(mb_substr,                                       NULL)
-       PHP_FE(mb_strcut,                                       NULL)
+       PHP_FE(mb_substr,                               NULL)
+       PHP_FE(mb_strcut,                               NULL)
        PHP_FE(mb_strwidth,                             NULL)
-       PHP_FE(mb_strimwidth,                           NULL)
+       PHP_FE(mb_strimwidth,                   NULL)
        PHP_FE(mb_convert_encoding,             NULL)
        PHP_FE(mb_detect_encoding,              NULL)
        PHP_FE(mb_convert_kana,                 NULL)
-       PHP_FE(mb_encode_mimeheader,            NULL)
-       PHP_FE(mb_decode_mimeheader,            NULL)
-       PHP_FE(mb_convert_variables,            (unsigned char *)third_and_rest_force_ref)
-       PHP_FE(mb_encode_numericentity,         NULL)
-       PHP_FE(mb_decode_numericentity,         NULL)
-       PHP_FE(mb_send_mail,                                    NULL)
-       PHP_FE(mb_get_info,                                     NULL)
-       PHP_FALIAS(mbstrlen,    mb_strlen,      NULL)
-       PHP_FALIAS(mbstrpos,    mb_strpos,      NULL)
-       PHP_FALIAS(mbstrrpos,   mb_strrpos,     NULL)
-       PHP_FALIAS(mbsubstr,    mb_substr,      NULL)
-       PHP_FALIAS(mbstrcut,    mb_strcut,      NULL)
-       PHP_FALIAS(i18n_internal_encoding,      mb_internal_encoding,   NULL)
-       PHP_FALIAS(i18n_http_input,                     mb_http_input,          NULL)
-       PHP_FALIAS(i18n_http_output,            mb_http_output,         NULL)
-       PHP_FALIAS(i18n_convert,                        mb_convert_encoding,    NULL)
-       PHP_FALIAS(i18n_discover_encoding,      mb_detect_encoding,     NULL)
-       PHP_FALIAS(i18n_mime_header_encode,     mb_encode_mimeheader,   NULL)
-       PHP_FALIAS(i18n_mime_header_decode,     mb_decode_mimeheader,   NULL)
-       PHP_FALIAS(i18n_ja_jp_hantozen,         mb_convert_kana,                NULL)
+       PHP_FE(mb_encode_mimeheader,    NULL)
+       PHP_FE(mb_decode_mimeheader,    NULL)
+       PHP_FE(mb_convert_variables,    (unsigned char *)third_and_rest_force_ref)
+       PHP_FE(mb_encode_numericentity, NULL)
+       PHP_FE(mb_decode_numericentity, NULL)
+       PHP_FE(mb_send_mail,                    NULL)
+       PHP_FE(mb_get_info,                             NULL)
 #if HAVE_MBREGEX
        PHP_MBREGEX_FUNCTION_ENTRIES
 #endif