[Asterisk-code-review] core: Remove dead symbols from asterisk.exports.in. (asterisk[15])

[Joshua Colp]

Joshua Colp has submitted this change and it was merged. ( https://gerrit.asterisk.org/8576 )

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

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
---
M include/asterisk/options.h
M main/asterisk.exports.in
M tests/test_amihooks.c
3 files changed, 3 insertions(+), 8 deletions(-)

Approvals:
  Joshua Colp: Looks good to me, but someone else must approve; Approved for Submit
  Richard Mudgett: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved



diff --git a/include/asterisk/options.h b/include/asterisk/options.h
index 78f596a..730fd68 100644
--- a/include/asterisk/options.h
+++ b/include/asterisk/options.h
@@ -199,8 +199,6 @@
 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 f997587..b434d38 100644
--- 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 14cfbdd..c465a3d 100644
--- a/tests/test_amihooks.c
+++ b/tests/test_amihooks.c
@@ -90,7 +90,8 @@
 	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);

-- 
To view, visit https://gerrit.asterisk.org/8576
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 15
Gerrit-MessageType: merged
Gerrit-Change-Id: I3ae026bc541cd9cb572be2ffa95fc359547642b5
Gerrit-Change-Number: 8576
Gerrit-PatchSet: 2
Gerrit-Owner: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180320/200ce934/attachment-0001.html>