diff options
| author | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-14 14:08:19 +0000 |
|---|---|---|
| committer | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-14 14:08:19 +0000 |
| commit | 3664249356aa4768fcb0b3b8e6cf9365fcbd0c8d (patch) | |
| tree | b68f48482e463e9c31126b2e3e24fca1dd2f6c82 /apps | |
| parent | f9d382fc079246930a99640d7835d6ae3e4149db (diff) | |
This rather large commit changes the way modules are loaded.
As partly documented in loader.c and include/asterisk/module.h,
modules are now expected to return all of their methods and flags
into a structure 'mod_data', and are normally loaded with RTLD_NOW
| RTLD_LOCAL, so symbols are resolved immediately and conflicts
should be less likely. Only in a small number of cases (res_*,
typically) modules are loaded RTLD_GLOBAL, so they can export
symbols.
The core of the change is only the two files loader.c and
include/asterisk/module.h, all the rest is simply adaptation of the
existing modules to the new API, a rather mechanical (but believe
me, time and finger-consuming!) process whose detail you can figure
out by svn diff'ing any single module.
Expect some minor compilation issue after this change, please
report it on mantis http://bugs.digium.com/view.php?id=6968
so we collect all the feedback in one place.
I am just sorry that this change missed SVN version number 20000!
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@20003 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
74 files changed, 479 insertions, 968 deletions
diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c index 0ac46181f..ff3817032 100644 --- a/apps/app_adsiprog.c +++ b/apps/app_adsiprog.c @@ -59,8 +59,6 @@ static char *descrip = " ADSIProg(script): This application programs an ADSI Phone with the given\n" "script. If nothing is specified, the default script (asterisk.adsi) is used.\n"; -LOCAL_USER_DECL; - struct adsi_event { int id; char *name; @@ -1568,35 +1566,32 @@ static int adsi_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; + STANDARD_HANGUP_LOCALUSERS; + res = ast_unregister_application(app); - STANDARD_HANGUP_LOCALUSERS; return res; } -int load_module(void) +static int load_module(void *mod) { + __mod_desc = mod; return ast_register_application(app, adsi_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { return "Asterisk ADSI Programming Application"; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key(void) +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD(MOD_1, NULL, NULL, NULL); diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c index e26845886..2754be4f4 100644 --- a/apps/app_alarmreceiver.c +++ b/apps/app_alarmreceiver.c @@ -97,8 +97,6 @@ static char time_stamp_format[128] = {"%a %b %d, %Y @ %H:%M:%S %Z"}; static char event_file[14] = "/event-XXXXXX"; -LOCAL_USER_DECL; - /* * Attempt to access a database variable and increment it, * provided that the user defined db-family in alarmreceiver.conf @@ -818,7 +816,7 @@ static int load_config(void) */ -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -829,25 +827,21 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { + __mod_desc = mod; load_config(); return ast_register_application(app, alarmreceiver_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { return "Alarm Receiver for Asterisk"; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key(void) +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_amd.c b/apps/app_amd.c index c054b2abf..16fc6bf64 100644 --- a/apps/app_amd.c +++ b/apps/app_amd.c @@ -72,9 +72,6 @@ static char *descrip = " MAXWORDS-<%d wordsCount>-<%d maximumNumberOfWords>\n" " LONGGREETING-<%d voiceDuration>-<%d greeting>\n"; - -LOCAL_USER_DECL; - #define STATE_IN_WORD 1 #define STATE_IN_SILENCE 2 @@ -392,38 +389,33 @@ static void load_config(void) return; } -int unload_module(void) +static int unload_module(void *mod) { STANDARD_HANGUP_LOCALUSERS; return ast_unregister_application(app); } -int load_module(void) +static int load_module(void *mod) { + __mod_desc = mod; load_config(); return ast_register_application(app, amd_exec, synopsis, descrip); } -int reload(void) +static int reload(void *mod) { load_config(); return 0; } -const char *description(void) +static const char *description(void) { return "Answering Machine Detection Application"; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key(void) +static const char *key(void) { return ASTERISK_GPL_KEY; } +STD_MOD(MOD_1, reload, NULL, NULL); diff --git a/apps/app_authenticate.c b/apps/app_authenticate.c index 259789747..eb3b7184d 100644 --- a/apps/app_authenticate.c +++ b/apps/app_authenticate.c @@ -91,8 +91,6 @@ static char *descrip = " Defaults to 0 - no limit - wait for the user press the '#' key.\n" ; -LOCAL_USER_DECL; - static int auth_exec(struct ast_channel *chan, void *data) { int res=0; @@ -235,35 +233,31 @@ static int auth_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; + STANDARD_HANGUP_LOCALUSERS; + res = ast_unregister_application(app); - STANDARD_HANGUP_LOCALUSERS; return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, auth_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { return "Authentication Application"; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key(void) +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD(MOD_1, NULL, NULL, NULL); diff --git a/apps/app_cdr.c b/apps/app_cdr.c index 0364bb4d9..ebf44bfe5 100644 --- a/apps/app_cdr.c +++ b/apps/app_cdr.c @@ -28,8 +28,6 @@ #include <sys/types.h> #include <stdlib.h> -#define STATIC_MODULE - #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") @@ -63,7 +61,7 @@ static int nocdr_exec(struct ast_channel *chan, void *data) return 0; } -STATIC_MODULE int unload_module(void) +static int unload_module(void *mod) { int res; @@ -74,24 +72,17 @@ STATIC_MODULE int unload_module(void) return res; } -STATIC_MODULE int load_module(void) +static int load_module(void *mod) { return ast_register_application(nocdr_app, nocdr_exec, nocdr_synopsis, nocdr_descrip); } -STATIC_MODULE const char *description(void) +static const char *description(void) { return "Tell Asterisk to not maintain a CDR for the current call"; } -STATIC_MODULE int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -STATIC_MODULE const char *key(void) +static const char *key(void) { return ASTERISK_GPL_KEY; } diff --git a/apps/app_chanisavail.c b/apps/app_chanisavail.c index 847cfc114..3cba77c4a 100644 --- a/apps/app_chanisavail.c +++ b/apps/app_chanisavail.c @@ -155,7 +155,7 @@ static int chanavail_exec(struct ast_channel *chan, void *data) return 0; } -int unload_module(void) +static int unload_module(void *mod) { int res = 0; @@ -166,24 +166,20 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { + __mod_desc = mod; return ast_register_application(app, chanavail_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { return "Check channel availability"; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key(void) +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_channelredirect.c b/apps/app_channelredirect.c index f527b7d38..4817ec222 100644 --- a/apps/app_channelredirect.c +++ b/apps/app_channelredirect.c @@ -120,7 +120,7 @@ static int asyncgoto_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -131,26 +131,20 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { + __mod_desc = mod; return ast_register_application(app, asyncgoto_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { return "Channel Redirect"; } -int usecount(void) -{ - int res; - - STANDARD_USECOUNT(res); - - return res; -} - -const char *key(void) +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 27ca2d3c3..37daa8162 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -554,7 +554,7 @@ static int chanspy_exec(struct ast_channel *chan, void *data) ALL_DONE(u, res); } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -565,24 +565,20 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { + __mod_desc = mod; return ast_register_application(app, chanspy_exec, synopsis, desc); } -const char *description(void) +static const char *description(void) { return (char *) synopsis; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD(MOD_1, NULL, NULL, NULL); diff --git a/apps/app_controlplayback.c b/apps/app_controlplayback.c index 5d70cc452..4d47b3e88 100644 --- a/apps/app_controlplayback.c +++ b/apps/app_controlplayback.c @@ -154,36 +154,26 @@ static int controlplayback_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; - res = ast_unregister_application(app); - - STANDARD_HANGUP_LOCALUSERS; - return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, controlplayback_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { return "Control Playback Application"; } -int usecount(void) -{ - int res; - - STANDARD_USECOUNT(res); - return res; -} - -const char *key(void) +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD(MOD_1, NULL, NULL, NULL); diff --git a/apps/app_db.c b/apps/app_db.c index 38b7c6ade..bb4bcbd9c 100644 --- a/apps/app_db.c +++ b/apps/app_db.c @@ -143,41 +143,35 @@ static int del_exec(struct ast_channel *chan, void *data) return 0; } -int unload_module(void) +static int unload_module(void *mod) { int retval; retval = ast_unregister_application(dt_app); retval |= ast_unregister_application(d_app); - STANDARD_HANGUP_LOCALUSERS; - return retval; } -int load_module(void) +static int load_module(void *mod) { int retval; + __mod_desc = mod; retval = ast_register_application(d_app, del_exec, d_synopsis, d_descrip); retval |= ast_register_application(dt_app, deltree_exec, dt_synopsis, dt_descrip); return retval; } -const char *description(void) +static const char *description(void) { return "Database Access Functions"; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key(void) +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD(MOD_1, NULL, NULL, NULL); diff --git a/apps/app_dial.c b/apps/app_dial.c index 5f9e55ab6..58e3c3e0e 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -35,7 +35,6 @@ #include <sys/signal.h> #include <netinet/in.h> -#define STATIC_MODULE #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") @@ -1729,7 +1728,7 @@ static int retrydial_exec(struct ast_channel *chan, void *data) } -STATIC_MODULE int unload_module(void) +static int unload_module(void *mod) { int res; @@ -1741,30 +1740,24 @@ STATIC_MODULE int unload_module(void) return res; } -STATIC_MODULE int load_module(void) +static int load_module(void *mod) { int res; + __mod_desc = mod; res = ast_register_application(app, dial_exec, synopsis, descrip); res |= ast_register_application(rapp, retrydial_exec, rsynopsis, rdescrip); return res; } -STATIC_MODULE const char *description(void) +static const char *description(void) { return "Dialing Application"; } -STATIC_MODULE int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -STATIC_MODULE const char *key(void) +static const char *key(void) { return ASTERISK_GPL_KEY; } diff --git a/apps/app_dictate.c b/apps/app_dictate.c index 871fc5a33..95f814096 100644 --- a/apps/app_dictate.c +++ b/apps/app_dictate.c @@ -46,7 +46,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/app.h" -static char *tdesc = "Virtual Dictation Machine"; static char *app = "Dictate"; static char *synopsis = "Virtual Dictation Machine"; static char *desc = " Dictate([<base_dir>[|<filename>]])\n" @@ -336,36 +335,27 @@ static int dictate_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; - res = ast_unregister_application(app); - - STANDARD_HANGUP_LOCALUSERS; - return res; } -int load_module(void) +static int load_module(void *mod) { + __mod_desc = mod; return ast_register_application(app, dictate_exec, synopsis, desc); } -const char *description(void) -{ - return tdesc; -} - -int usecount(void) +static const char *description(void) { - int res; - STANDARD_USECOUNT(res); - return res; + return "Virtual Dictation Machine"; } -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } +STD_MOD(MOD_1, NULL, NULL, NULL); diff --git a/apps/app_directed_pickup.c b/apps/app_directed_pickup.c index a8ef0e1c0..e75e34a26 100644 --- a/apps/app_directed_pickup.c +++ b/apps/app_directed_pickup.c @@ -42,7 +42,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/app.h" -static const char *tdesc = "Directed Call Pickup Application"; static const char *app = "Pickup"; static const char *synopsis = "Directed Call Pickup"; static const char *descrip = @@ -134,37 +133,29 @@ static int pickup_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; res = ast_unregister_application(app); - STANDARD_HANGUP_LOCALUSERS; - return res; } -int load_module(void) +static int load_module(void *mod) { + __mod_desc = mod; return ast_register_application(app, pickup_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { - return (char *) tdesc; + return "Directed Call Pickup Application"; } -int usecount(void) -{ - int res; - - STANDARD_USECOUNT(res); - - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD(MOD_1, NULL, NULL, NULL); diff --git a/apps/app_directory.c b/apps/app_directory.c index 88399897b..316720088 100644 --- a/apps/app_directory.c +++ b/apps/app_directory.c @@ -45,7 +45,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/utils.h" #include "asterisk/app.h" -static char *tdesc = "Extension Directory"; static char *app = "Directory"; static char *synopsis = "Provide directory of voicemail extensions"; @@ -517,35 +516,27 @@ static int directory_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; - res = ast_unregister_application(app); - - STANDARD_HANGUP_LOCALUSERS; - return res; } -int load_module(void) +static int load_module(void *mod) { + __mod_desc = mod; return ast_register_application(app, directory_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { - return tdesc; + return "Extension Directory"; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_disa.c b/apps/app_disa.c index 29b115789..d7c3a5872 100644 --- a/apps/app_disa.c +++ b/apps/app_disa.c @@ -49,8 +49,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/callerid.h" #include "asterisk/stringfields.h" -static char *tdesc = "DISA (Direct Inward System Access) Application"; - static char *app = "DISA"; static char *synopsis = "DISA (Direct Inward System Access)"; @@ -376,7 +374,7 @@ reorder: return -1; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -387,24 +385,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, disa_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { - return tdesc; + return "DISA (Direct Inward System Access) Application"; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key(void) +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_dumpchan.c b/apps/app_dumpchan.c index e6968c89b..aa8854620 100644 --- a/apps/app_dumpchan.c +++ b/apps/app_dumpchan.c @@ -46,7 +46,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/utils.h" -static char *tdesc = "Dump Info About The Calling Channel"; static char *app = "DumpChan"; static char *synopsis = "Dump Info About The Calling Channel"; static char *desc = @@ -157,7 +156,7 @@ static int dumpchan_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -168,25 +167,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, dumpchan_exec, synopsis, desc); } -const char *description(void) +static const char *description(void) { - return tdesc; + return "Dump Info About The Calling Channel"; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } +STD_MOD1; diff --git a/apps/app_echo.c b/apps/app_echo.c index 803c1b592..183f843fe 100644 --- a/apps/app_echo.c +++ b/apps/app_echo.c @@ -95,7 +95,7 @@ static int echo_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -106,24 +106,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, echo_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_exec.c b/apps/app_exec.c index 3f8c18b0e..33775ea72 100644 --- a/apps/app_exec.c +++ b/apps/app_exec.c @@ -160,7 +160,7 @@ static int tryexec_exec(struct ast_channel *chan, void *data) return 0; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -172,26 +172,21 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { int res = ast_register_application(app_exec, exec_exec, exec_synopsis, exec_descrip); res |= ast_register_application(app_tryexec, tryexec_exec, tryexec_synopsis, tryexec_descrip); return res; } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_externalivr.c b/apps/app_externalivr.c index 1c378fcf2..ef35637c9 100644 --- a/apps/app_externalivr.c +++ b/apps/app_externalivr.c @@ -51,7 +51,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/app.h" #include "asterisk/utils.h" -static const char *tdesc = "External IVR Interface Application"; static const char *app = "ExternalIVR"; @@ -551,7 +550,7 @@ static int app_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -562,26 +561,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, app_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { - return (char *) tdesc; + return "External IVR Interface Application"; } -int usecount(void) -{ - int res; - - STANDARD_USECOUNT(res); - - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_festival.c b/apps/app_festival.c index ca65130fc..f06cbaef3 100644 --- a/apps/app_festival.c +++ b/apps/app_festival.c @@ -58,8 +58,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #define FESTIVAL_CONFIG "festival.conf" -static char *tdesc = "Simple Festival Interface"; - static char *app = "Festival"; static char *synopsis = "Say text to the user"; @@ -501,7 +499,7 @@ static int festival_exec(struct ast_channel *chan, void *vdata) } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -512,25 +510,20 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { - return ast_register_application(app, festival_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { - return tdesc; -} + return "Simple Festival Interface"; -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; } -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_flash.c b/apps/app_flash.c index e056b723e..0e3eba4dd 100644 --- a/apps/app_flash.c +++ b/apps/app_flash.c @@ -50,8 +50,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/image.h" #include "asterisk/options.h" -static char *tdesc = "Flash zap trunk application"; - static char *app = "Flash"; static char *synopsis = "Flashes a Zap Trunk"; @@ -107,7 +105,7 @@ static int flash_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -118,24 +116,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, flash_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { - return tdesc; + return "Flash zap trunk application"; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_forkcdr.c b/apps/app_forkcdr.c index 08aca6aac..68951b038 100644 --- a/apps/app_forkcdr.c +++ b/apps/app_forkcdr.c @@ -42,7 +42,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/cdr.h" #include "asterisk/module.h" -static char *tdesc = "Fork The CDR into 2 separate entities."; static char *app = "ForkCDR"; static char *synopsis = "Forks the Call Data Record"; @@ -98,7 +97,7 @@ static int forkcdr_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -109,24 +108,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, forkcdr_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { - return tdesc; + return "Fork The CDR into 2 separate entities."; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c index e9ada0b6f..5baab8676 100644 --- a/apps/app_getcpeid.c +++ b/apps/app_getcpeid.c @@ -43,8 +43,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/adsi.h" #include "asterisk/options.h" -static char *tdesc = "Get ADSI CPE ID"; - static char *app = "GetCPEID"; static char *synopsis = "Get ADSI CPE ID"; @@ -133,7 +131,7 @@ static int cpeid_exec(struct ast_channel *chan, void *idata) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -144,24 +142,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, cpeid_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { - return tdesc; + return "Get ADSI CPE ID"; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_hasnewvoicemail.c b/apps/app_hasnewvoicemail.c index 96b67072e..f21bd7ae6 100644 --- a/apps/app_hasnewvoicemail.c +++ b/apps/app_hasnewvoicemail.c @@ -53,7 +53,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/app.h" #include "asterisk/options.h" -static char *tdesc = "Indicator for whether a voice mailbox has messages in a given folder."; static char *app_hasvoicemail = "HasVoicemail"; static char *hasvoicemail_synopsis = "Conditionally branches to priority + 101 with the right options set"; static char *hasvoicemail_descrip = @@ -219,7 +218,7 @@ struct ast_custom_function acf_vmcount = { .read = acf_vmcount_exec, }; -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -232,7 +231,7 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { int res; @@ -243,19 +242,14 @@ int load_module(void) return res; } -const char *description(void) +static const char *description(void) { - return tdesc; + return "Indicator for whether a voice mailbox has messages in a given folder."; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_ices.c b/apps/app_ices.c index ae48cbb67..3a8130ab6 100644 --- a/apps/app_ices.c +++ b/apps/app_ices.c @@ -50,8 +50,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #define ICES "/usr/bin/ices" #define LOCAL_ICES "/usr/local/bin/ices" -static char *tdesc = "Encode and Stream via icecast and ices"; - static char *app = "ICES"; static char *synopsis = "Encode and stream using 'ices'"; @@ -191,7 +189,7 @@ static int ices_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -202,24 +200,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, ices_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { - return tdesc; + return "Encode and Stream via icecast and ices"; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_image.c b/apps/app_image.c index 63c588e17..9e69bd4cd 100644 --- a/apps/app_image.c +++ b/apps/app_image.c @@ -112,7 +112,7 @@ static int sendimage_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -123,24 +123,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, sendimage_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_ivrdemo.c b/apps/app_ivrdemo.c index 4147efe73..1ceedf6a7 100644 --- a/apps/app_ivrdemo.c +++ b/apps/app_ivrdemo.c @@ -110,7 +110,7 @@ static int skel_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -121,24 +121,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, skel_exec, tdesc, synopsis); } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_lookupblacklist.c b/apps/app_lookupblacklist.c index 87db8f3ba..9db3d450b 100644 --- a/apps/app_lookupblacklist.c +++ b/apps/app_lookupblacklist.c @@ -107,7 +107,7 @@ lookupblacklist_exec (struct ast_channel *chan, void *data) return 0; } -int unload_module (void) +static int unload_module(void *mod) { int res; @@ -118,24 +118,19 @@ int unload_module (void) return res; } -int load_module (void) +static int load_module(void *mod) { return ast_register_application (app, lookupblacklist_exec, synopsis,descrip); } -const char *description (void) +static const char *description(void) { return tdesc; } -int usecount (void) -{ - int res; - STANDARD_USECOUNT (res); - return res; -} - -const char *key () +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_lookupcidname.c b/apps/app_lookupcidname.c index f279b3b69..a4af9eb96 100644 --- a/apps/app_lookupcidname.c +++ b/apps/app_lookupcidname.c @@ -80,8 +80,7 @@ lookupcidname_exec (struct ast_channel *chan, void *data) return 0; } -int -unload_module (void) +static int unload_module(void *mod) { int res; @@ -92,27 +91,19 @@ unload_module (void) return res; } -int -load_module (void) +static int load_module(void *mod) { - return ast_register_application (app, lookupcidname_exec, synopsis, - descrip); + return ast_register_application (app, lookupcidname_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { - return tdesc; + return tdesc; } -int -usecount (void) +static const char *key(void) { - int res; - STANDARD_USECOUNT (res); - return res; + return ASTERISK_GPL_KEY; } -const char *key() -{ - return ASTERISK_GPL_KEY; -} +STD_MOD1; diff --git a/apps/app_macro.c b/apps/app_macro.c index 28674a9b6..fb3290fc1 100644 --- a/apps/app_macro.c +++ b/apps/app_macro.c @@ -343,7 +343,7 @@ static int macro_exit_exec(struct ast_channel *chan, void *data) return MACRO_EXIT_RESULT; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -356,7 +356,7 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { int res; @@ -367,19 +367,14 @@ int load_module(void) return res; } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 0a1681a3d..6ca35a241 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -60,7 +60,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/translate.h" #include "asterisk/ulaw.h" -static const char *tdesc = "MeetMe conference bridge"; static const char *app = "MeetMe"; static const char *app2 = "MeetMeCount"; @@ -2425,7 +2424,7 @@ static void load_config(void) ast_config_destroy(cfg); } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -2440,7 +2439,7 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { int res; @@ -2455,29 +2454,21 @@ int load_module(void) return res; } -int reload(void) +static int reload(void *mod) { load_config(); return 0; } -const char *description(void) +static const char *description(void) { - return (char *) tdesc; + return "MeetMe conference bridge"; } -int usecount(void) -{ - int res; - - STANDARD_USECOUNT(res); - - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } +STD_MOD(MOD_1, reload, NULL, NULL); diff --git a/apps/app_milliwatt.c b/apps/app_milliwatt.c index f40b40161..215fcb6bf 100644 --- a/apps/app_milliwatt.c +++ b/apps/app_milliwatt.c @@ -43,8 +43,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/module.h" #include "asterisk/utils.h" -static char *tdesc = "Digital Milliwatt (mu-law) Test Application"; - static char *app = "Milliwatt"; static char *synopsis = "Generate a Constant 1000Hz tone at 0dbm (mu-law)"; @@ -140,7 +138,7 @@ static int milliwatt_exec(struct ast_channel *chan, void *data) return -1; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -151,24 +149,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, milliwatt_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { - return tdesc; + return "Digital Milliwatt (mu-law) Test Application"; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c index 43b5f7b95..d4e374a4b 100644 --- a/apps/app_mixmonitor.c +++ b/apps/app_mixmonitor.c @@ -57,7 +57,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #define get_volfactor(x) x ? ((x > 0) ? (1 << x) : ((1 << abs(x)) * -1)) : 0 -static const char *tdesc = "Mixed Audio Monitoring Application"; static const char *app = "MixMonitor"; static const char *synopsis = "Record a call and mix the audio during the recording"; static const char *desc = "" @@ -88,7 +87,7 @@ static const char *stop_desc = "" "on the current channel.\n" ""; -LOCAL_USER_DECL; +struct module_symbols *me; static const char *mixmonitor_spy_type = "MixMonitor"; @@ -169,7 +168,7 @@ static void *mixmonitor_thread(void *obj) struct ast_frame *f; char post_process[1024] = ""; - STANDARD_INCREMENT_USECOUNT; + ast_atomic_fetchadd_int(&__mod_desc->usecnt, +1); name = ast_strdupa(mixmonitor->chan->name); @@ -282,7 +281,7 @@ out2: out: free(mixmonitor); - STANDARD_DECREMENT_USECOUNT; + ast_atomic_fetchadd_int(&__mod_desc->usecnt, -1); return NULL; } @@ -461,7 +460,7 @@ static struct ast_cli_entry cli_mixmonitor = { complete_mixmonitor_cli }; -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -474,7 +473,7 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { int res; @@ -485,21 +484,14 @@ int load_module(void) return res; } -const char *description(void) +static const char *description(void) { - return (char *) tdesc; + return "Mixed Audio Monitoring Application"; } -int usecount(void) -{ - int res; - - STANDARD_USECOUNT(res); - - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_morsecode.c b/apps/app_morsecode.c index c21fd51fb..81fe6a321 100644 --- a/apps/app_morsecode.c +++ b/apps/app_morsecode.c @@ -162,7 +162,7 @@ static int morsecode_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -173,24 +173,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app_morsecode, morsecode_exec, morsecode_synopsis, morsecode_descrip); } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_mp3.c b/apps/app_mp3.c index 36131784b..bfb0eb9ad 100644 --- a/apps/app_mp3.c +++ b/apps/app_mp3.c @@ -226,7 +226,7 @@ static int mp3_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -237,24 +237,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, mp3_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_nbscat.c b/apps/app_nbscat.c index 36ad54db9..a557f2dfa 100644 --- a/apps/app_nbscat.c +++ b/apps/app_nbscat.c @@ -207,7 +207,7 @@ static int NBScat_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -218,24 +218,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, NBScat_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c index 4be14f94a..bc12f5ba0 100644 --- a/apps/app_osplookup.c +++ b/apps/app_osplookup.c @@ -596,7 +596,7 @@ static int ospfinished_exec(struct ast_channel *chan, void *data) return(res); } -int load_module(void) +static int load_module(void *mod) { int res; @@ -610,7 +610,7 @@ int load_module(void) return(res); } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -626,25 +626,14 @@ int unload_module(void) return(res); } -int reload(void) +static const char *description(void) { - return(0); + return "Open Settlement Protocol Applications"; } -const char *description(void) -{ - return("Open Settlement Protocol Applications"); -} - -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return(res); -} - -const char *key() +static const char *key(void) { return(ASTERISK_GPL_KEY); } +STD_MOD1; diff --git a/apps/app_page.c b/apps/app_page.c index 720c7abb7..0dee1611f 100644 --- a/apps/app_page.c +++ b/apps/app_page.c @@ -45,8 +45,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/chanvars.h" #include "asterisk/utils.h" -static const char *tdesc = "Page Multiple Phones"; - static const char *app_page= "Page"; static const char *page_synopsis = "Pages phones"; @@ -205,7 +203,7 @@ static int page_exec(struct ast_channel *chan, void *data) return -1; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -216,26 +214,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app_page, page_exec, page_synopsis, page_descrip); } -const char *description(void) +static const char *description(void) { - return (char *) tdesc; + return "Page Multiple Phones"; } -int usecount(void) -{ - int res; - - STANDARD_USECOUNT(res); - - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_parkandannounce.c b/apps/app_parkandannounce.c index 1f7393930..26f661464 100644 --- a/apps/app_parkandannounce.c +++ b/apps/app_parkandannounce.c @@ -255,9 +255,7 @@ static int parkandannounce_exec(struct ast_channel *chan, void *data) return res; } - - -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -268,25 +266,20 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { /* return ast_register_application(app, park_exec); */ return ast_register_application(app, parkandannounce_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_playback.c b/apps/app_playback.c index a9ce353ea..fc5dcf20a 100644 --- a/apps/app_playback.c +++ b/apps/app_playback.c @@ -135,7 +135,7 @@ static int playback_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -146,24 +146,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, playback_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_privacy.c b/apps/app_privacy.c index 6ce7d1fb8..eb722e5a3 100644 --- a/apps/app_privacy.c +++ b/apps/app_privacy.c @@ -210,8 +210,7 @@ static int privacy_exec (struct ast_channel *chan, void *data) return 0; } -int -unload_module (void) +static int unload_module(void *mod) { int res; @@ -222,27 +221,19 @@ unload_module (void) return res; } -int -load_module (void) +static int load_module(void *mod) { - return ast_register_application (app, privacy_exec, synopsis, - descrip); + return ast_register_application (app, privacy_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { - return tdesc; + return tdesc; } -int -usecount (void) +static const char *key(void) { - int res; - STANDARD_USECOUNT (res); - return res; + return ASTERISK_GPL_KEY; } -const char *key() -{ - return ASTERISK_GPL_KEY; -} +STD_MOD1; diff --git a/apps/app_queue.c b/apps/app_queue.c index 043d9797d..1642cf6f1 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -3852,7 +3852,7 @@ static struct ast_cli_entry cli_remove_queue_member = { { "remove", "queue", "member", NULL }, handle_remove_queue_member, "Removes a channel from a specified queue", rqm_cmd_usage, complete_remove_queue_member }; -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -3880,7 +3880,7 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { int res; @@ -3912,26 +3912,21 @@ int load_module(void) return res; } - -int reload(void) +static int reload(void *mod) { reload_queues(); return 0; } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD(MOD_1, reload, NULL, NULL); + diff --git a/apps/app_random.c b/apps/app_random.c index 9e42c7f28..c8a7f8287 100644 --- a/apps/app_random.c +++ b/apps/app_random.c @@ -95,7 +95,7 @@ static int random_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -106,24 +106,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app_random, random_exec, random_synopsis, random_descrip); } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_read.c b/apps/app_read.c index 94afc523d..fa1c01c92 100644 --- a/apps/app_read.c +++ b/apps/app_read.c @@ -221,7 +221,7 @@ static int read_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -232,24 +232,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, read_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_readfile.c b/apps/app_readfile.c index 833ae9c7c..f0c1215ae 100644 --- a/apps/app_readfile.c +++ b/apps/app_readfile.c @@ -107,7 +107,7 @@ static int readfile_exec(struct ast_channel *chan, void *data) } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -118,24 +118,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app_readfile, readfile_exec, readfile_synopsis, readfile_descrip); } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_realtime.c b/apps/app_realtime.c index 9cce38ca7..dacc6c328 100644 --- a/apps/app_realtime.c +++ b/apps/app_realtime.c @@ -232,7 +232,7 @@ static int realtime_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -246,7 +246,7 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { int res; @@ -258,20 +258,14 @@ int load_module(void) return res; } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } +STD_MOD1; diff --git a/apps/app_record.c b/apps/app_record.c index 864714f56..38d6437e7 100644 --- a/apps/app_record.c +++ b/apps/app_record.c @@ -29,8 +29,6 @@ #include <stdio.h> #include <string.h> -#define STATIC_MODULE - #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") @@ -46,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/utils.h" #include "asterisk/options.h" -static char *tdesc = "Trivial Record Application"; static char *app = "Record"; @@ -343,7 +340,7 @@ static int record_exec(struct ast_channel *chan, void *data) return res; } -STATIC_MODULE int unload_module(void) +static int unload_module(void *mod) { int res; @@ -354,26 +351,19 @@ STATIC_MODULE int unload_module(void) return res; } -STATIC_MODULE int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, record_exec, synopsis, descrip); } -STATIC_MODULE const char *description(void) -{ - return tdesc; -} - -STATIC_MODULE int usecount(void) +static const char *description(void) { - int res; - STANDARD_USECOUNT(res); - return res; + return "Trivial Record Application"; } -STATIC_MODULE const char *key(void) +static const char *key(void) { return ASTERISK_GPL_KEY; } -STD_MOD(MOD_1, NULL, NULL, NULL); +STD_MOD1; diff --git a/apps/app_rpt.c b/apps/app_rpt.c index d4e817799..d919fc23e 100644 --- a/apps/app_rpt.c +++ b/apps/app_rpt.c @@ -7023,7 +7023,7 @@ static int rpt_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int i; @@ -7041,7 +7041,7 @@ int unload_module(void) return i; } -int load_module(void) +static int load_module(void *mod) { ast_pthread_create(&rpt_master_thread,NULL,rpt_master,NULL); @@ -7052,20 +7052,14 @@ int load_module(void) return ast_register_application(app, rpt_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } +STD_MOD1; diff --git a/apps/app_sayunixtime.c b/apps/app_sayunixtime.c index b70d074bc..9b208ca2e 100644 --- a/apps/app_sayunixtime.c +++ b/apps/app_sayunixtime.c @@ -107,7 +107,7 @@ static int sayunixtime_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -119,7 +119,7 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { int res; @@ -129,19 +129,14 @@ int load_module(void) return res; } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_senddtmf.c b/apps/app_senddtmf.c index 10c803a27..9ba21d2f3 100644 --- a/apps/app_senddtmf.c +++ b/apps/app_senddtmf.c @@ -93,7 +93,7 @@ static int senddtmf_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -104,24 +104,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, senddtmf_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_sendtext.c b/apps/app_sendtext.c index e6bb80e79..87f0f0bec 100644 --- a/apps/app_sendtext.c +++ b/apps/app_sendtext.c @@ -46,8 +46,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/options.h" #include "asterisk/app.h" -static const char *tdesc = "Send Text Applications"; - static const char *app = "SendText"; static const char *synopsis = "Send a Text Message"; @@ -118,7 +116,7 @@ static int sendtext_exec(struct ast_channel *chan, void *data) return 0; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -129,26 +127,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, sendtext_exec, synopsis, descrip); } -const char *description(void) -{ - return (char *) tdesc; -} - -int usecount(void) +static const char *description(void) { - int res; - - STANDARD_USECOUNT(res); - - return res; + return "Send Text Applications"; } -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_setcallerid.c b/apps/app_setcallerid.c index d1c0c0aa4..5d34859fc 100644 --- a/apps/app_setcallerid.c +++ b/apps/app_setcallerid.c @@ -136,7 +136,7 @@ static int setcallerid_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -148,7 +148,7 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { int res; @@ -158,19 +158,14 @@ int load_module(void) return res; } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_setcdruserfield.c b/apps/app_setcdruserfield.c index 80d56d2f3..165f2c60c 100644 --- a/apps/app_setcdruserfield.c +++ b/apps/app_setcdruserfield.c @@ -137,7 +137,7 @@ static int appendcdruserfield_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -150,7 +150,7 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { int res; @@ -161,19 +161,14 @@ int load_module(void) return res; } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_settransfercapability.c b/apps/app_settransfercapability.c index 7b07ad0f6..2bf4e01f8 100644 --- a/apps/app_settransfercapability.c +++ b/apps/app_settransfercapability.c @@ -111,7 +111,7 @@ static int settransfercapability_exec(struct ast_channel *chan, void *data) } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -122,24 +122,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, settransfercapability_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { return synopsis; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_skel.c b/apps/app_skel.c index 25a431182..598170d2e 100644 --- a/apps/app_skel.c +++ b/apps/app_skel.c @@ -43,7 +43,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/app.h" -static char *tdesc = "Trivial skeleton Application"; static char *app = "Skel"; static char *synopsis = "Skeleton application."; @@ -119,44 +118,26 @@ static int app_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; - res = ast_unregister_application(app); - - STANDARD_HANGUP_LOCALUSERS; - return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, app_exec, synopsis, descrip); } -int reload(void) -{ - /* This function will be called if a 'reload' is requested */ - - return 0; -} - -const char *description(void) +static const char *description(void) { - return tdesc; + return "Trivial skeleton Application"; } -int usecount(void) -{ - int res; - - STANDARD_USECOUNT(res); - - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_sms.c b/apps/app_sms.c index 373ca8906..c3488b911 100644 --- a/apps/app_sms.c +++ b/apps/app_sms.c @@ -1511,7 +1511,7 @@ static int sms_exec (struct ast_channel *chan, void *data) return (h.err); } -int unload_module (void) +static int unload_module(void *mod) { int res; @@ -1522,7 +1522,7 @@ int unload_module (void) return res; } -int load_module (void) +static int load_module(void *mod) { #ifdef OUTALAW { @@ -1536,19 +1536,14 @@ int load_module (void) return ast_register_application (app, sms_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount (void) -{ - int res; - STANDARD_USECOUNT (res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_softhangup.c b/apps/app_softhangup.c index a651dce63..a987f317a 100644 --- a/apps/app_softhangup.c +++ b/apps/app_softhangup.c @@ -105,7 +105,7 @@ static int softhangup_exec(struct ast_channel *chan, void *data) return 0; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -116,24 +116,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, softhangup_exec, synopsis, desc); } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_speech_utils.c b/apps/app_speech_utils.c index babf39b5d..8cd6046e4 100644 --- a/apps/app_speech_utils.c +++ b/apps/app_speech_utils.c @@ -723,7 +723,7 @@ static int speech_destroy(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res = 0; @@ -746,7 +746,7 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { int res = 0; @@ -767,26 +767,14 @@ int load_module(void) return res; } -int reload(void) -{ - return 0; -} - -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - - STANDARD_USECOUNT(res); - - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_stack.c b/apps/app_stack.c index 87a7bf177..1734f0311 100644 --- a/apps/app_stack.c +++ b/apps/app_stack.c @@ -44,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #define STACKVAR "~GOSUB~STACK~" -static const char *tdesc = "Stack Routines"; static const char *app_gosub = "Gosub"; static const char *app_gosubif = "GosubIf"; @@ -152,7 +151,7 @@ static int gosubif_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { ast_unregister_application(app_return); ast_unregister_application(app_pop); @@ -164,7 +163,7 @@ int unload_module(void) return 0; } -int load_module(void) +static int load_module(void *mod) { ast_register_application(app_pop, pop_exec, pop_synopsis, pop_descrip); ast_register_application(app_return, return_exec, return_synopsis, return_descrip); @@ -174,21 +173,14 @@ int load_module(void) return 0; } -const char *description(void) +static const char *description(void) { - return (char *) tdesc; + return "Stack Routines"; } -int usecount(void) -{ - int res; - - STANDARD_USECOUNT(res); - - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_system.c b/apps/app_system.c index 12e46c828..6a13f6b49 100644 --- a/apps/app_system.c +++ b/apps/app_system.c @@ -136,7 +136,7 @@ static int trysystem_exec(struct ast_channel *chan, void *data) return system_exec_helper(chan, data, 0); } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -148,7 +148,7 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { int res; @@ -158,19 +158,14 @@ int load_module(void) return res; } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_talkdetect.c b/apps/app_talkdetect.c index 012893b47..dadde6a02 100644 --- a/apps/app_talkdetect.c +++ b/apps/app_talkdetect.c @@ -214,7 +214,7 @@ static int background_detect_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -225,24 +225,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, background_detect_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_test.c b/apps/app_test.c index 04e1d5377..db822b6c6 100644 --- a/apps/app_test.c +++ b/apps/app_test.c @@ -490,7 +490,7 @@ static int testserver_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -502,7 +502,7 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { int res; @@ -512,19 +512,14 @@ int load_module(void) return res; } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key(void) +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_transfer.c b/apps/app_transfer.c index 67f67fe8a..8bd046097 100644 --- a/apps/app_transfer.c +++ b/apps/app_transfer.c @@ -47,8 +47,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") LOCAL_USER_DECL; -static const char *tdesc = "Transfer"; - static const char *app = "Transfer"; static const char *synopsis = "Transfer caller to remote extension"; @@ -144,7 +142,7 @@ static int transfer_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -155,26 +153,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, transfer_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { - return (char *) tdesc; + return "Transfer"; } -int usecount(void) -{ - int res; - - STANDARD_USECOUNT(res); - - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_url.c b/apps/app_url.c index eb59bf513..7d34d9d9b 100644 --- a/apps/app_url.c +++ b/apps/app_url.c @@ -161,7 +161,7 @@ out: return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -172,24 +172,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, sendurl_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_userevent.c b/apps/app_userevent.c index ddcec710e..c476c71fe 100644 --- a/apps/app_userevent.c +++ b/apps/app_userevent.c @@ -99,7 +99,7 @@ static int userevent_exec(struct ast_channel *chan, void *data) return 0; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -110,24 +110,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, userevent_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_verbose.c b/apps/app_verbose.c index 4d2e8fcc2..eb698f0b8 100644 --- a/apps/app_verbose.c +++ b/apps/app_verbose.c @@ -150,7 +150,7 @@ static int log_exec(struct ast_channel *chan, void *data) return 0; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -162,7 +162,7 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { int res; @@ -172,19 +172,14 @@ int load_module(void) return res; } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index ae061de3c..d64c4963e 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -6389,12 +6389,12 @@ static int load_config(void) } } -int reload(void) +static int reload(void *mod) { return(load_config()); } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -6411,7 +6411,7 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { int res; res = ast_register_application(app, vm_exec, synopsis_vm, descrip_vm); @@ -6443,11 +6443,6 @@ int load_module(void) return res; } -const char *description(void) -{ - return tdesc; -} - static int dialout(struct ast_channel *chan, struct ast_vm_user *vmu, char *num, char *outgoing_context) { int cmd = 0; @@ -6860,18 +6855,16 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re if (cmd == 't') cmd = 0; return cmd; - } +} - -int usecount(void) +static const char *description(void) { - int res; - STANDARD_USECOUNT(res); - return res; + return tdesc; } -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } +STD_MOD(MOD_1, reload, NULL, NULL); diff --git a/apps/app_waitforring.c b/apps/app_waitforring.c index 35784502d..466061f7f 100644 --- a/apps/app_waitforring.c +++ b/apps/app_waitforring.c @@ -120,7 +120,7 @@ static int waitforring_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -131,24 +131,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, waitforring_exec, synopsis, desc); } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_waitforsilence.c b/apps/app_waitforsilence.c index f00516b29..17ffd8985 100644 --- a/apps/app_waitforsilence.c +++ b/apps/app_waitforsilence.c @@ -175,7 +175,7 @@ static int waitforsilence_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -186,25 +186,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, waitforsilence_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } +STD_MOD1; diff --git a/apps/app_while.c b/apps/app_while.c index b3b520fb3..075a5276a 100644 --- a/apps/app_while.c +++ b/apps/app_while.c @@ -325,7 +325,7 @@ static int while_end_exec(struct ast_channel *chan, void *data) { } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -338,7 +338,7 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { int res; @@ -349,20 +349,14 @@ int load_module(void) return res; } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } +STD_MOD1; diff --git a/apps/app_zapateller.c b/apps/app_zapateller.c index e5f49777a..39c9f701b 100644 --- a/apps/app_zapateller.c +++ b/apps/app_zapateller.c @@ -104,7 +104,7 @@ static int zapateller_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -115,24 +115,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, zapateller_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_zapbarge.c b/apps/app_zapbarge.c index d71095f5b..ad77a6e4b 100644 --- a/apps/app_zapbarge.c +++ b/apps/app_zapbarge.c @@ -302,7 +302,7 @@ out: return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -313,24 +313,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, conf_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_zapras.c b/apps/app_zapras.c index 3cf46a631..d918b7d24 100644 --- a/apps/app_zapras.c +++ b/apps/app_zapras.c @@ -240,7 +240,7 @@ static int zapras_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -251,24 +251,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, zapras_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; diff --git a/apps/app_zapscan.c b/apps/app_zapscan.c index 55a629422..affa16d6a 100644 --- a/apps/app_zapscan.c +++ b/apps/app_zapscan.c @@ -363,7 +363,7 @@ static int conf_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -374,25 +374,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, conf_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } +STD_MOD1; |