Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

optional_api: Remove unused nonoptreq fields

Browse Source 
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
15
Walter Doekes 7 years ago
parent 5ae6c7bc26
commit 4616c6508a
39 changed files with 4 additions and 43 deletions
Show Stats Download Patch File Download Diff File

1
apps/app_adsiprog.c
Unescape View File

@ -1613,5 +1613,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",
);

1
apps/app_getcpeid.c
Unescape View File

@ -140,5 +140,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",
);

1
apps/app_queue.c
Unescape View File

@ -11291,5 +11291,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",
);

1
apps/app_speech_utils.c
Unescape View File

@ -1003,5 +1003,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",
);

1
apps/app_stack.c
Unescape View File

@ -1320,5 +1320,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",
);

1
apps/app_stasis.c
Unescape View File

@ -144,5 +144,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",
);

1
apps/app_voicemail.c
Unescape View File

@ -16428,5 +16428,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, tdesc,
.load = load_module,
.unload = unload_module,
.reload = reload,
.nonoptreq = "res_adsi,res_smdi",
);

1
channels/chan_dahdi.c
Unescape View File

@ -19546,5 +19546,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",
);

1
channels/chan_iax2.c
Unescape View File

@ -14909,5 +14909,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",
);

1
channels/chan_mgcp.c
Unescape View File

@ -5025,5 +5025,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",
);

1
channels/chan_sip.c
Unescape View File

@ -35607,5 +35607,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",
);

1
funcs/func_aes.c
Unescape View File

@ -181,5 +181,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",
);

5
include/asterisk/module.h
Unescape View File

@ -338,9 +338,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;

1
pbx/pbx_dundi.c
Unescape View File

@ -5101,5 +5101,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Distributed Universal Nu
.load = load_module,
.unload = unload_module,
.reload = reload,
.nonoptreq = "res_crypto",
);

1
res/res_ari.c
Unescape View File

@ -1197,6 +1197,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,
);

1
res/res_ari_applications.c
Unescape View File

@ -518,5 +518,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",
);

1
res/res_ari_asterisk.c
Unescape View File

@ -1239,5 +1239,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",
);

1
res/res_ari_bridges.c
Unescape View File

@ -1565,5 +1565,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",
);

1
res/res_ari_channels.c
Unescape View File

@ -2869,5 +2869,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",
);

1
res/res_ari_device_states.c
Unescape View File

@ -349,5 +349,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",
);

1
res/res_ari_endpoints.c
Unescape View File

@ -473,5 +473,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",
);

1
res/res_ari_events.c
Unescape View File

@ -473,5 +473,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",
);

1
res/res_ari_mailboxes.c
Unescape View File

@ -355,5 +355,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",
);

1
res/res_ari_playbacks.c
Unescape View File

@ -307,5 +307,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",
);

1
res/res_ari_recordings.c
Unescape View File

@ -891,5 +891,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",
);

1
res/res_ari_sounds.c
Unescape View File

@ -237,5 +237,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",
);

1
res/res_chan_stats.c
Unescape View File

@ -182,5 +182,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"
);

1
res/res_endpoint_stats.c
Unescape View File

@ -151,5 +151,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"
);

1
res/res_stasis_answer.c
Unescape View File

@ -73,5 +73,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"
);

1
res/res_stasis_device_state.c
Unescape View File

@ -482,5 +482,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"
);

1
res/res_stasis_mailbox.c
Unescape View File

@ -161,5 +161,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"
);

1
res/res_stasis_playback.c
Unescape View File

@ -759,5 +759,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"
);

3
res/res_stasis_recording.c
Unescape View File

@ -655,6 +655,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,
);

1
res/res_stasis_snoop.c
Unescape View File

@ -445,5 +445,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"
);

3
res/res_stasis_test.c
Unescape View File

@ -103,8 +103,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

1
rest-api-templates/res_ari_resource.c.mustache
Unescape View File

@ -322,6 +322,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}}

1
tests/test_ari.c
Unescape View File

@ -573,5 +573,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",
);

1
tests/test_res_stasis.c
Unescape View File

@ -195,5 +195,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",
);

1
tests/test_stasis_endpoints.c
Unescape View File

@ -306,5 +306,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",
);

Write Preview
Loading…
Cancel
Save