[Asterisk-code-review] optional api: Remove unused nonoptreq fields (asterisk[13])
Walter Doekes
asteriskteam at digium.com
Tue Sep 11 07:07:56 CDT 2018
Walter Doekes has uploaded this change for review. ( https://gerrit.asterisk.org/10078
Change subject: optional_api: Remove unused nonoptreq fields
......................................................................
optional_api: Remove unused nonoptreq fields
As they're not actively used, they only grow stale. The moduleinfo field itself
is kept in Asterisk 13/15 for ABI compatibility.
Change-Id: I8df66a7007f807840414bb348511a8c14c05a9fc
---
M apps/app_adsiprog.c
M apps/app_getcpeid.c
M apps/app_queue.c
M apps/app_speech_utils.c
M apps/app_stack.c
M apps/app_stasis.c
M apps/app_voicemail.c
M channels/chan_dahdi.c
M channels/chan_iax2.c
M channels/chan_mgcp.c
M channels/chan_sip.c
M funcs/func_aes.c
M include/asterisk/module.h
M pbx/pbx_dundi.c
M res/res_ari.c
M res/res_ari_applications.c
M res/res_ari_asterisk.c
M res/res_ari_bridges.c
M res/res_ari_channels.c
M res/res_ari_device_states.c
M res/res_ari_endpoints.c
M res/res_ari_events.c
M res/res_ari_mailboxes.c
M res/res_ari_playbacks.c
M res/res_ari_recordings.c
M res/res_ari_sounds.c
M res/res_chan_stats.c
M res/res_endpoint_stats.c
M res/res_stasis_answer.c
M res/res_stasis_device_state.c
M res/res_stasis_mailbox.c
M res/res_stasis_playback.c
M res/res_stasis_recording.c
M res/res_stasis_snoop.c
M res/res_stasis_test.c
M tests/test_ari.c
M tests/test_res_stasis.c
M tests/test_stasis_endpoints.c
38 files changed, 11 insertions(+), 44 deletions(-)
git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/78/10078/1
diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index e73795a..6ca02a7 100644
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -1615,5 +1615,4 @@
.support_level = AST_MODULE_SUPPORT_EXTENDED,
.load = load_module,
.unload = unload_module,
- .nonoptreq = "res_adsi",
);
diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c
index 87a9701..eff9d08 100644
--- a/apps/app_getcpeid.c
+++ b/apps/app_getcpeid.c
@@ -142,5 +142,4 @@
.support_level = AST_MODULE_SUPPORT_EXTENDED,
.load = load_module,
.unload = unload_module,
- .nonoptreq = "res_adsi",
);
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 6bc2e67..2c7ed2a 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -11086,5 +11086,4 @@
.unload = unload_module,
.reload = reload,
.load_pri = AST_MODPRI_DEVSTATE_CONSUMER,
- .nonoptreq = "res_monitor",
);
diff --git a/apps/app_speech_utils.c b/apps/app_speech_utils.c
index 49b5b30..0beccc6 100644
--- a/apps/app_speech_utils.c
+++ b/apps/app_speech_utils.c
@@ -1005,5 +1005,4 @@
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
.unload = unload_module,
- .nonoptreq = "res_speech",
);
diff --git a/apps/app_stack.c b/apps/app_stack.c
index 4cade64..cc5c487 100644
--- a/apps/app_stack.c
+++ b/apps/app_stack.c
@@ -1322,5 +1322,4 @@
.load = load_module,
.unload = unload_module,
.load_pri = AST_MODPRI_APP_DEPEND,
- .nonoptreq = "res_agi",
);
diff --git a/apps/app_stasis.c b/apps/app_stasis.c
index 1e5b567..e0beee2 100644
--- a/apps/app_stasis.c
+++ b/apps/app_stasis.c
@@ -146,5 +146,4 @@
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
.unload = unload_module,
- .nonoptreq = "res_stasis",
);
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 94af147..96699e6 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -16494,5 +16494,4 @@
.load = load_module,
.unload = unload_module,
.reload = reload,
- .nonoptreq = "res_adsi,res_smdi",
);
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 2f5daae..3b05d72 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -19857,5 +19857,4 @@
.unload = unload_module,
.reload = reload,
.load_pri = AST_MODPRI_CHANNEL_DRIVER,
- .nonoptreq = "res_smdi",
);
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 4e3816e..7a369e1 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -15245,5 +15245,4 @@
.unload = unload_module,
.reload = reload,
.load_pri = AST_MODPRI_CHANNEL_DRIVER,
- .nonoptreq = "res_crypto",
- );
+ );
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index e8c2293..c9ed1e2 100644
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -5016,5 +5016,4 @@
.unload = unload_module,
.reload = reload,
.load_pri = AST_MODPRI_CHANNEL_DRIVER,
- .nonoptreq = "res_pktccops",
);
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index af4f06d..ebfcfeb 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -35740,5 +35740,4 @@
.unload = unload_module,
.reload = reload,
.load_pri = AST_MODPRI_CHANNEL_DRIVER,
- .nonoptreq = "res_crypto,res_http_websocket",
);
diff --git a/funcs/func_aes.c b/funcs/func_aes.c
index c51fe0a..2592dc3 100644
--- a/funcs/func_aes.c
+++ b/funcs/func_aes.c
@@ -183,5 +183,4 @@
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
.unload = unload_module,
- .nonoptreq = "res_crypto",
- );
+ );
diff --git a/include/asterisk/module.h b/include/asterisk/module.h
index 0b8fbad..384cf4c 100644
--- a/include/asterisk/module.h
+++ b/include/asterisk/module.h
@@ -341,9 +341,8 @@
* on load. */
unsigned char load_pri;
- /*! Modules which should be loaded first, in comma-separated string format.
- * These are only required for loading, when the optional_api header file
- * detects that the compiler does not support the optional API featureset. */
+ /*! Obsolete! This is not used since the optional_api portability rework.
+ * This field does nothing and will be removed in future version of Asterisk. */
const char *nonoptreq;
/*! The support level for the given module */
enum ast_module_support_level support_level;
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index bbcae06..d2c9877 100644
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -5103,5 +5103,4 @@
.load = load_module,
.unload = unload_module,
.reload = reload,
- .nonoptreq = "res_crypto",
);
diff --git a/res/res_ari.c b/res/res_ari.c
index 75af26b..0554587 100644
--- a/res/res_ari.c
+++ b/res/res_ari.c
@@ -1194,6 +1194,5 @@
.load = load_module,
.unload = unload_module,
.reload = reload_module,
- .nonoptreq = "res_http_websocket",
.load_pri = AST_MODPRI_APP_DEPEND,
);
diff --git a/res/res_ari_applications.c b/res/res_ari_applications.c
index 290719d..c70b926 100644
--- a/res/res_ari_applications.c
+++ b/res/res_ari_applications.c
@@ -520,5 +520,4 @@
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
.unload = unload_module,
- .nonoptreq = "res_ari,res_stasis",
);
diff --git a/res/res_ari_asterisk.c b/res/res_ari_asterisk.c
index 73e4d0c..7480ac8 100644
--- a/res/res_ari_asterisk.c
+++ b/res/res_ari_asterisk.c
@@ -1241,5 +1241,4 @@
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
.unload = unload_module,
- .nonoptreq = "res_ari,res_stasis",
);
diff --git a/res/res_ari_bridges.c b/res/res_ari_bridges.c
index b923330..0e1bf1c 100644
--- a/res/res_ari_bridges.c
+++ b/res/res_ari_bridges.c
@@ -1433,5 +1433,4 @@
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
.unload = unload_module,
- .nonoptreq = "res_ari,res_stasis",
);
diff --git a/res/res_ari_channels.c b/res/res_ari_channels.c
index 6217679..dafca15 100644
--- a/res/res_ari_channels.c
+++ b/res/res_ari_channels.c
@@ -2497,5 +2497,4 @@
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
.unload = unload_module,
- .nonoptreq = "res_ari,res_stasis",
);
diff --git a/res/res_ari_device_states.c b/res/res_ari_device_states.c
index fe1817d..f1125b8 100644
--- a/res/res_ari_device_states.c
+++ b/res/res_ari_device_states.c
@@ -351,5 +351,4 @@
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
.unload = unload_module,
- .nonoptreq = "res_ari,res_stasis",
);
diff --git a/res/res_ari_endpoints.c b/res/res_ari_endpoints.c
index a46b0dc..11ce4c3 100644
--- a/res/res_ari_endpoints.c
+++ b/res/res_ari_endpoints.c
@@ -475,5 +475,4 @@
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
.unload = unload_module,
- .nonoptreq = "res_ari,res_stasis",
);
diff --git a/res/res_ari_events.c b/res/res_ari_events.c
index b6a44d9..04c1c79 100644
--- a/res/res_ari_events.c
+++ b/res/res_ari_events.c
@@ -467,5 +467,4 @@
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
.unload = unload_module,
- .nonoptreq = "res_ari,res_stasis",
);
diff --git a/res/res_ari_mailboxes.c b/res/res_ari_mailboxes.c
index 600ecfd..22b0ca2 100644
--- a/res/res_ari_mailboxes.c
+++ b/res/res_ari_mailboxes.c
@@ -357,5 +357,4 @@
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
.unload = unload_module,
- .nonoptreq = "res_ari,res_stasis",
);
diff --git a/res/res_ari_playbacks.c b/res/res_ari_playbacks.c
index 106463b..fca079b 100644
--- a/res/res_ari_playbacks.c
+++ b/res/res_ari_playbacks.c
@@ -309,5 +309,4 @@
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
.unload = unload_module,
- .nonoptreq = "res_ari,res_stasis",
);
diff --git a/res/res_ari_recordings.c b/res/res_ari_recordings.c
index c43148d..033a480 100644
--- a/res/res_ari_recordings.c
+++ b/res/res_ari_recordings.c
@@ -825,5 +825,4 @@
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
.unload = unload_module,
- .nonoptreq = "res_ari,res_stasis",
);
diff --git a/res/res_ari_sounds.c b/res/res_ari_sounds.c
index e58ecd1..6473985 100644
--- a/res/res_ari_sounds.c
+++ b/res/res_ari_sounds.c
@@ -239,5 +239,4 @@
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
.unload = unload_module,
- .nonoptreq = "res_ari,res_stasis",
);
diff --git a/res/res_chan_stats.c b/res/res_chan_stats.c
index 9104e0e..2648d60 100644
--- a/res/res_chan_stats.c
+++ b/res/res_chan_stats.c
@@ -184,5 +184,4 @@
.support_level = AST_MODULE_SUPPORT_EXTENDED,
.load = load_module,
.unload = unload_module,
- .nonoptreq = "res_statsd"
);
diff --git a/res/res_endpoint_stats.c b/res/res_endpoint_stats.c
index e2b4ffa..85d75e4 100644
--- a/res/res_endpoint_stats.c
+++ b/res/res_endpoint_stats.c
@@ -153,5 +153,4 @@
.support_level = AST_MODULE_SUPPORT_EXTENDED,
.load = load_module,
.unload = unload_module,
- .nonoptreq = "res_statsd"
);
diff --git a/res/res_stasis_answer.c b/res/res_stasis_answer.c
index 05d5302..5d2e67c 100644
--- a/res/res_stasis_answer.c
+++ b/res/res_stasis_answer.c
@@ -75,4 +75,4 @@
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
.unload = unload_module,
- .nonoptreq = "res_stasis");
+ );
diff --git a/res/res_stasis_device_state.c b/res/res_stasis_device_state.c
index 9924dd8..34c77d9 100644
--- a/res/res_stasis_device_state.c
+++ b/res/res_stasis_device_state.c
@@ -484,4 +484,4 @@
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
.unload = unload_module,
- .nonoptreq = "res_stasis");
+ );
diff --git a/res/res_stasis_mailbox.c b/res/res_stasis_mailbox.c
index 6e5e5ff..1c6918d 100644
--- a/res/res_stasis_mailbox.c
+++ b/res/res_stasis_mailbox.c
@@ -163,5 +163,4 @@
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
.unload = unload_module,
- .nonoptreq = "res_stasis,res_mwi_external"
);
diff --git a/res/res_stasis_playback.c b/res/res_stasis_playback.c
index 57d1fd2..6a0e6c3 100644
--- a/res/res_stasis_playback.c
+++ b/res/res_stasis_playback.c
@@ -688,4 +688,4 @@
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
.unload = unload_module,
- .nonoptreq = "res_stasis,res_stasis_recording");
+ );
diff --git a/res/res_stasis_recording.c b/res/res_stasis_recording.c
index 5508be8..93c32c9 100644
--- a/res/res_stasis_recording.c
+++ b/res/res_stasis_recording.c
@@ -657,5 +657,5 @@
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
.unload = unload_module,
- .nonoptreq = "res_stasis",
- .load_pri = AST_MODPRI_APP_DEPEND);
+ .load_pri = AST_MODPRI_APP_DEPEND,
+ );
diff --git a/res/res_stasis_snoop.c b/res/res_stasis_snoop.c
index da66894..785bbe2 100644
--- a/res/res_stasis_snoop.c
+++ b/res/res_stasis_snoop.c
@@ -447,4 +447,4 @@
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
.unload = unload_module,
- .nonoptreq = "res_stasis");
+ );
diff --git a/res/res_stasis_test.c b/res/res_stasis_test.c
index fe015ec..fbf4202 100644
--- a/res/res_stasis_test.c
+++ b/res/res_stasis_test.c
@@ -104,8 +104,7 @@
* it has to do with how we load modules.
*
* Modules have their own metadata compiled into them in the module info block
- * at the end of the file. This includes dependency information in the
- * \c nonoptreq field.
+ * at the end of the file.
*
* Asterisk loads the module, inspects the field, then loads any needed
* dependencies. This works because Asterisk passes \c RTLD_LAZY to the initial
diff --git a/tests/test_ari.c b/tests/test_ari.c
index e2c36fb..6043adf 100644
--- a/tests/test_ari.c
+++ b/tests/test_ari.c
@@ -574,5 +574,4 @@
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "ARI testing",
.load = load_module,
.unload = unload_module,
- .nonoptreq = "res_ari",
);
diff --git a/tests/test_res_stasis.c b/tests/test_res_stasis.c
index 805634f..7b1c8ca 100644
--- a/tests/test_res_stasis.c
+++ b/tests/test_res_stasis.c
@@ -196,5 +196,4 @@
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Stasis Core testing",
.load = load_module,
.unload = unload_module,
- .nonoptreq = "res_stasis",
);
diff --git a/tests/test_stasis_endpoints.c b/tests/test_stasis_endpoints.c
index 17e2d05..c7645fd 100644
--- a/tests/test_stasis_endpoints.c
+++ b/tests/test_stasis_endpoints.c
@@ -307,5 +307,4 @@
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Endpoint stasis-related testing",
.load = load_module,
.unload = unload_module,
- .nonoptreq = "res_stasis_test",
);
--
To view, visit https://gerrit.asterisk.org/10078
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8df66a7007f807840414bb348511a8c14c05a9fc
Gerrit-Change-Number: 10078
Gerrit-PatchSet: 1
Gerrit-Owner: Walter Doekes <walter+asterisk at wjd.nu>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180911/a8681e33/attachment-0001.html>
More information about the asterisk-code-review
mailing list