- Remove unexposed functions.

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index a4116c9ae3194330bef3bef6dab16b1ac9f0a3ca..7badd335818cd5ac1bd8359907b32c956dc5a0f9 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -2733,122 +2733,6 @@ PHP_FUNCTION(mb_list_encodings)
 }
 /* }}} */
 
-/* {{{ proto array mb_list_encodings_alias_names([string encoding])
-   Returns an array of all supported alias encodings */
-PHP_FUNCTION(mb_list_encodings_alias_names)
-{
-       const mbfl_encoding **encodings;
-       const mbfl_encoding *encoding;
-       enum mbfl_no_encoding no_encoding;
-       int i, j;
-       zval *row;
-       char *name = NULL;
-       int name_len;
-
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &name, &name_len) == FAILURE) {
-               RETURN_FALSE;
-       }
-
-       if (name == NULL) {
-               array_init(return_value);
-               i = 0;
-               encodings = mbfl_get_supported_encodings();
-               while ((encoding = encodings[i++]) != NULL) {
-                       MAKE_STD_ZVAL(row);
-                       array_init(row);
-                       if (encoding->aliases != NULL) {
-                               j = 0;
-                               while ((*encoding->aliases)[j] != NULL) {
-                                       add_next_index_string(row, (char *)(*encoding->aliases)[j], 1);
-                                       j++;
-                               }
-                       }
-                       add_assoc_zval(return_value, (char *) encoding->name, row);
-               }
-       } else {
-               no_encoding = mbfl_name2no_encoding(name);
-               if (no_encoding == mbfl_no_encoding_invalid) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding \"%s\"", name);
-                       RETURN_FALSE;
-               }
-
-               name = (char *)mbfl_no_encoding2name(no_encoding);
-               if (name != NULL) {
-                       i = 0;
-                       encodings = mbfl_get_supported_encodings();
-                       while ((encoding = encodings[i++]) != NULL) {
-                               if (strcmp(encoding->name, name) != 0){ continue; }
-
-                               array_init(return_value);
-                               if (encoding->aliases != NULL) {
-                                       j = 0;
-                                       while ((*encoding->aliases)[j] != NULL) {
-                                               add_next_index_string(return_value, (char *)(*encoding->aliases)[j], 1);
-                                               j++;
-                                       }
-                               }
-
-                               break;
-                       }
-               } else {
-                       RETURN_FALSE;
-               }
-       }
-}
-/* }}} */
-
-/* {{{ proto mixed mb_list_mime_names([string encoding])
-   Returns an array or string of all supported mime names */
-PHP_FUNCTION(mb_list_mime_names)
-{
-       const mbfl_encoding **encodings;
-       const mbfl_encoding *encoding;
-       enum mbfl_no_encoding no_encoding;
-       int i;
-       char *name = NULL;
-       int name_len;
-
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &name, &name_len) == FAILURE) {
-               RETURN_FALSE;
-       }
-
-       if (name == NULL) {
-               array_init(return_value);
-               i = 0;
-               encodings = mbfl_get_supported_encodings();
-               while ((encoding = encodings[i++]) != NULL) {
-                       if(encoding->mime_name != NULL) {
-                               add_assoc_string(return_value, (char *) encoding->name, (char *) encoding->mime_name, 1);
-                       } else{
-                               add_assoc_string(return_value, (char *) encoding->name, "", 1);
-                       }
-               }
-       } else {
-               no_encoding = mbfl_name2no_encoding(name);
-               if (no_encoding == mbfl_no_encoding_invalid) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding \"%s\"", name);
-                       RETURN_FALSE;
-               }
-
-               name = (char *)mbfl_no_encoding2name(no_encoding);
-               if (name != NULL) {
-                       i = 0;
-                       encodings = mbfl_get_supported_encodings();
-                       while ((encoding = encodings[i++]) != NULL) {
-                               if (strcmp(encoding->name, name) != 0){ continue; }
-                               if(encoding->mime_name != NULL) {
-                                       RETURN_STRING((char *) encoding->mime_name, 1);
-                               }
-                               break;
-                       }
-                       RETURN_STRING("", 1);
-               } else {
-                       RETURN_FALSE;
-               }
-       }
-}
-/* }}} */
-
 /* {{{ proto string mb_encode_mimeheader(string str [, string charset [, string transfer-encoding [, string linefeed [, int indent]]]])
    Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= */
 PHP_FUNCTION(mb_encode_mimeheader)

diff --git a/ext/mbstring/mbstring.h b/ext/mbstring/mbstring.h
index 80e7a1d0c323ad36f09a60b239ccf934c6e66f4c..2a5d5a6a2dcf4edf3d1ab4e595a365bac792c9f8 100644 (file)
--- a/ext/mbstring/mbstring.h
+++ b/ext/mbstring/mbstring.h
@@ -118,8 +118,6 @@ 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_convert_kana);
 PHP_FUNCTION(mb_encode_mimeheader);
 PHP_FUNCTION(mb_decode_mimeheader);