core: Remove dead symbols from asterisk.exports.in.

* dahdi_chan_name
* dahdi_chan_name_len
* dahdi_chan_mode
* __manager_event
* dialed_interface_info

Added comment about __progname and environ being needed for FreeBSD to
prevent accidental removal in the future.

Change-Id: I3ae026bc541cd9cb572be2ffa95fc359547642b5

diff --git a/include/asterisk/options.h b/include/asterisk/options.h
index 27f1d9132939ebf6f525a10d618004cfbd46e021..0b0c376cc7fc75507a4ecfa5f1354af6d6fa19ea 100644 (file)
--- a/include/asterisk/options.h
+++ b/include/asterisk/options.h
@@ -199,8 +199,6 @@ extern struct timeval ast_lastreloadtime;
 extern pid_t ast_mainpid;
 
 extern char record_cache_dir[AST_CACHE_DIR_LEN];
-extern char dahdi_chan_name[AST_CHANNEL_NAME];
-extern int dahdi_chan_name_len;
 
 extern int ast_language_is_prefix;
 

diff --git a/main/asterisk.exports.in b/main/asterisk.exports.in
index f997587c9f3c0d87174c6597b402ca5bafc3cb01..b434d38afd7930b38a3beaaa1c2be1bcb7683b92 100644 (file)
--- a/main/asterisk.exports.in
+++ b/main/asterisk.exports.in
@@ -13,9 +13,6 @@
                LINKER_SYMBOL_PREFIX__ao2_*;
                LINKER_SYMBOL_PREFIXoption_debug;
                LINKER_SYMBOL_PREFIXoption_verbose;
-               LINKER_SYMBOL_PREFIXdahdi_chan_name;
-               LINKER_SYMBOL_PREFIXdahdi_chan_name_len;
-               LINKER_SYMBOL_PREFIXdahdi_chan_mode;
                LINKER_SYMBOL_PREFIXcallerid_*;
                LINKER_SYMBOL_PREFIXcid_di;
                LINKER_SYMBOL_PREFIXcid_dr;
@@ -30,8 +27,6 @@
                LINKER_SYMBOL_PREFIXterm_*;
                LINKER_SYMBOL_PREFIXchannelreloadreason2txt;
                LINKER_SYMBOL_PREFIXdevstate2str;
-               LINKER_SYMBOL_PREFIX__manager_event;
-               LINKER_SYMBOL_PREFIXdialed_interface_info;
                LINKER_SYMBOL_PREFIXstrsep;
                LINKER_SYMBOL_PREFIXsetenv;
                LINKER_SYMBOL_PREFIXstasis_*;
@@ -49,6 +44,7 @@
                LINKER_SYMBOL_PREFIXres_srtp;
                LINKER_SYMBOL_PREFIXres_srtp_policy;
                LINKER_SYMBOL_PREFIXsecure_call_info;
+               /* __progname and environ are needed by FreeBSD for bundled pjproject. */
                LINKER_SYMBOL_PREFIX__progname;
                LINKER_SYMBOL_PREFIXenviron;
                /*

diff --git a/tests/test_amihooks.c b/tests/test_amihooks.c
index 1f10a0166bd0ba88792fb886e5a4f6a4d138d7c5..522ed54c34bf9b88acccc8f0bff0c57078af5657 100644 (file)
--- a/tests/test_amihooks.c
+++ b/tests/test_amihooks.c
@@ -40,7 +40,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/utils.h"
 #include "asterisk/manager.h"
 
-/* The helper function is required by struct manager_custom_hook. See __manager_event for details */
+/* The helper function is required by struct manager_custom_hook.
+ * See __ast_manager_event_multichan for details */
 static int amihook_helper(int category, const char *event, char *content)
 {
        ast_log(LOG_NOTICE, "AMI Event: \nCategory: %d Event: %s\n%s\n", category, event, content);