From: Walter Doekes Date: Tue, 11 Sep 2018 12:08:30 +0000 (+0200) Subject: optional_api: Remove unused nonoptreq fields X-Git-Tag: 13.24.0-rc1~113^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d226458c5b56adf7c0a670701731d47c1ac3b13b;p=thirdparty%2Fasterisk.git 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. ASTERISK-28046 #close Change-Id: I8df66a7007f807840414bb348511a8c14c05a9fc --- diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c index e73795aaeb..6ca02a7077 100644 --- a/apps/app_adsiprog.c +++ b/apps/app_adsiprog.c @@ -1615,5 +1615,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Asterisk ADSI Programmin .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 87a9701c3a..eff9d08254 100644 --- a/apps/app_getcpeid.c +++ b/apps/app_getcpeid.c @@ -142,5 +142,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Get ADSI CPE ID", .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 6bc2e67161..2c7ed2a6fa 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -11086,5 +11086,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "True Call Queueing", .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 49b5b304bf..0beccc6ceb 100644 --- a/apps/app_speech_utils.c +++ b/apps/app_speech_utils.c @@ -1005,5 +1005,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Dialplan Speech Applicat .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 4cade64d26..cc5c487622 100644 --- a/apps/app_stack.c +++ b/apps/app_stack.c @@ -1322,5 +1322,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT | AST_MODFLAG_LOAD_ORDER, .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 1e5b5673c0..e0beee2eab 100644 --- a/apps/app_stasis.c +++ b/apps/app_stasis.c @@ -146,5 +146,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Stasis dialplan applicat .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 94af147dec..96699e6e5b 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -16494,5 +16494,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, tdesc, .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 2f5daae768..3b05d72170 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -19857,5 +19857,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, tdesc, .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 4e3816e72a..7a369e1a74 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -15245,5 +15245,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Inter Asterisk eXchan .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 e8c2293cf5..c9ed1e2f59 100644 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -5016,5 +5016,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Media Gateway Control .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 af4f06db7c..ebfcfeb18b 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -35740,5 +35740,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Session Initiation Pr .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 c51fe0a6c3..2592dc3235 100644 --- a/funcs/func_aes.c +++ b/funcs/func_aes.c @@ -183,5 +183,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "AES dialplan functions", .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 0b8fbad84f..384cf4c168 100644 --- a/include/asterisk/module.h +++ b/include/asterisk/module.h @@ -341,9 +341,8 @@ struct ast_module_info { * 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 bbcae06315..d2c9877f9e 100644 --- a/pbx/pbx_dundi.c +++ b/pbx/pbx_dundi.c @@ -5103,5 +5103,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Distributed Universal Nu .load = load_module, .unload = unload_module, .reload = reload, - .nonoptreq = "res_crypto", ); diff --git a/res/res_ari.c b/res/res_ari.c index 75af26b276..0554587e1a 100644 --- a/res/res_ari.c +++ b/res/res_ari.c @@ -1194,6 +1194,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ .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 290719d360..c70b926799 100644 --- a/res/res_ari_applications.c +++ b/res/res_ari_applications.c @@ -520,5 +520,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Sta .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 73e4d0ce3a..7480ac8850 100644 --- a/res/res_ari_asterisk.c +++ b/res/res_ari_asterisk.c @@ -1241,5 +1241,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Ast .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 b923330956..0e1bf1c4e3 100644 --- a/res/res_ari_bridges.c +++ b/res/res_ari_bridges.c @@ -1433,5 +1433,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Bri .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 621767980f..dafca15962 100644 --- a/res/res_ari_channels.c +++ b/res/res_ari_channels.c @@ -2497,5 +2497,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Cha .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 fe1817d5da..f1125b88a4 100644 --- a/res/res_ari_device_states.c +++ b/res/res_ari_device_states.c @@ -351,5 +351,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Dev .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 a46b0dc610..11ce4c394c 100644 --- a/res/res_ari_endpoints.c +++ b/res/res_ari_endpoints.c @@ -475,5 +475,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - End .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 b6a44d9b93..04c1c7946f 100644 --- a/res/res_ari_events.c +++ b/res/res_ari_events.c @@ -467,5 +467,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Web .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 600ecfd48b..22b0ca2734 100644 --- a/res/res_ari_mailboxes.c +++ b/res/res_ari_mailboxes.c @@ -357,5 +357,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Mai .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 106463b5b5..fca079b4f7 100644 --- a/res/res_ari_playbacks.c +++ b/res/res_ari_playbacks.c @@ -309,5 +309,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Pla .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 c43148d836..033a480f06 100644 --- a/res/res_ari_recordings.c +++ b/res/res_ari_recordings.c @@ -825,5 +825,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Rec .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 e58ecd1cf6..6473985a3d 100644 --- a/res/res_ari_sounds.c +++ b/res/res_ari_sounds.c @@ -239,5 +239,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Sou .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 9104e0e049..2648d60621 100644 --- a/res/res_chan_stats.c +++ b/res/res_chan_stats.c @@ -184,5 +184,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Example of how to use St .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 e2b4ffa2e7..85d75e4695 100644 --- a/res/res_endpoint_stats.c +++ b/res/res_endpoint_stats.c @@ -153,5 +153,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Endpoint statistics", .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 05d5302fdf..5d2e67c459 100644 --- a/res/res_stasis_answer.c +++ b/res/res_stasis_answer.c @@ -75,4 +75,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis applicatio .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 9924dd89c4..34c77d9f09 100644 --- a/res/res_stasis_device_state.c +++ b/res/res_stasis_device_state.c @@ -484,4 +484,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis applicatio .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 6e5e5ffa62..1c6918de09 100644 --- a/res/res_stasis_mailbox.c +++ b/res/res_stasis_mailbox.c @@ -163,5 +163,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis applicatio .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 57d1fd2583..6a0e6c3cad 100644 --- a/res/res_stasis_playback.c +++ b/res/res_stasis_playback.c @@ -688,4 +688,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis applicatio .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 5508be8884..93c32c97c4 100644 --- a/res/res_stasis_recording.c +++ b/res/res_stasis_recording.c @@ -657,5 +657,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ .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 da66894f6d..785bbe21e6 100644 --- a/res/res_stasis_snoop.c +++ b/res/res_stasis_snoop.c @@ -447,4 +447,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis applicatio .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 fe015ec73b..fbf4202e07 100644 --- a/res/res_stasis_test.c +++ b/res/res_stasis_test.c @@ -104,8 +104,7 @@ struct stasis_message_sink *stasis_message_sink_create(void) * 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/rest-api-templates/res_ari_resource.c.mustache b/rest-api-templates/res_ari_resource.c.mustache index 0e8635d97e..40e18556f7 100644 --- a/rest-api-templates/res_ari_resource.c.mustache +++ b/rest-api-templates/res_ari_resource.c.mustache @@ -305,6 +305,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - {{{ .support_level = AST_MODULE_SUPPORT_CORE, .load = load_module, .unload = unload_module, - .nonoptreq = "res_ari,res_stasis", ); {{/api_declaration}} diff --git a/tests/test_ari.c b/tests/test_ari.c index e2c36fb384..6043adf597 100644 --- a/tests/test_ari.c +++ b/tests/test_ari.c @@ -574,5 +574,4 @@ static int load_module(void) 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 805634f265..7b1c8cac2b 100644 --- a/tests/test_res_stasis.c +++ b/tests/test_res_stasis.c @@ -196,5 +196,4 @@ static int load_module(void) 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 17e2d05f08..c7645fdf09 100644 --- a/tests/test_stasis_endpoints.c +++ b/tests/test_stasis_endpoints.c @@ -307,5 +307,4 @@ static int load_module(void) AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Endpoint stasis-related testing", .load = load_module, .unload = unload_module, - .nonoptreq = "res_stasis_test", );