core: Remove dead symbols from asterisk.exports.in.
authorCorey Farrell <git@cfware.com>
Sun, 18 Mar 2018 01:03:29 +0000 (21:03 -0400)
committerCorey Farrell <git@cfware.com>
Mon, 19 Mar 2018 21:59:59 +0000 (17:59 -0400)
* 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

include/asterisk/options.h
main/asterisk.exports.in
tests/test_amihooks.c

index 78f596a..730fd68 100644 (file)
@@ -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;
 
index f997587..b434d38 100644 (file)
@@ -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;
                /*
index 14cfbdd..c465a3d 100644 (file)
@@ -90,7 +90,8 @@ AST_TEST_DEFINE(amihook_cli_send)
        return wait_for_hook(test) ? AST_TEST_FAIL : AST_TEST_PASS;
 }
 
-/* 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);