[asterisk-commits] file: branch file/usecnt-cleanup r54526 - in /team/file/usecnt-cleanup: apps/...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Wed Feb 14 17:50:32 MST 2007


Author: file
Date: Wed Feb 14 18:50:30 2007
New Revision: 54526

URL: http://svn.digium.com/view/asterisk?view=rev&rev=54526
Log:
Drop unload_module from as many modules as possible and rely on module linking to have stuff automatically unregister. This shaves about 2MB off my modules directory in comparison to current trunk.

Modified:
    team/file/usecnt-cleanup/apps/app_adsiprog.c
    team/file/usecnt-cleanup/apps/app_alarmreceiver.c
    team/file/usecnt-cleanup/apps/app_amd.c
    team/file/usecnt-cleanup/apps/app_authenticate.c
    team/file/usecnt-cleanup/apps/app_cdr.c
    team/file/usecnt-cleanup/apps/app_chanisavail.c
    team/file/usecnt-cleanup/apps/app_channelredirect.c
    team/file/usecnt-cleanup/apps/app_chanspy.c
    team/file/usecnt-cleanup/apps/app_controlplayback.c
    team/file/usecnt-cleanup/apps/app_db.c
    team/file/usecnt-cleanup/apps/app_dial.c
    team/file/usecnt-cleanup/apps/app_dictate.c
    team/file/usecnt-cleanup/apps/app_directed_pickup.c
    team/file/usecnt-cleanup/apps/app_directory.c
    team/file/usecnt-cleanup/apps/app_disa.c
    team/file/usecnt-cleanup/apps/app_dumpchan.c
    team/file/usecnt-cleanup/apps/app_exec.c
    team/file/usecnt-cleanup/apps/app_externalivr.c
    team/file/usecnt-cleanup/apps/app_festival.c
    team/file/usecnt-cleanup/apps/app_flash.c
    team/file/usecnt-cleanup/apps/app_forkcdr.c
    team/file/usecnt-cleanup/apps/app_getcpeid.c
    team/file/usecnt-cleanup/apps/app_ices.c
    team/file/usecnt-cleanup/apps/app_image.c
    team/file/usecnt-cleanup/apps/app_ivrdemo.c
    team/file/usecnt-cleanup/apps/app_macro.c
    team/file/usecnt-cleanup/apps/app_milliwatt.c
    team/file/usecnt-cleanup/apps/app_mixmonitor.c
    team/file/usecnt-cleanup/apps/app_morsecode.c
    team/file/usecnt-cleanup/apps/app_mp3.c
    team/file/usecnt-cleanup/apps/app_nbscat.c
    team/file/usecnt-cleanup/apps/app_page.c
    team/file/usecnt-cleanup/apps/app_parkandannounce.c
    team/file/usecnt-cleanup/apps/app_privacy.c
    team/file/usecnt-cleanup/apps/app_read.c
    team/file/usecnt-cleanup/apps/app_readfile.c
    team/file/usecnt-cleanup/apps/app_record.c
    team/file/usecnt-cleanup/apps/app_sayunixtime.c
    team/file/usecnt-cleanup/apps/app_sendtext.c
    team/file/usecnt-cleanup/apps/app_setcallerid.c
    team/file/usecnt-cleanup/apps/app_sms.c
    team/file/usecnt-cleanup/apps/app_softhangup.c
    team/file/usecnt-cleanup/apps/app_speech_utils.c
    team/file/usecnt-cleanup/apps/app_stack.c
    team/file/usecnt-cleanup/apps/app_system.c
    team/file/usecnt-cleanup/apps/app_talkdetect.c
    team/file/usecnt-cleanup/apps/app_test.c
    team/file/usecnt-cleanup/apps/app_transfer.c
    team/file/usecnt-cleanup/apps/app_url.c
    team/file/usecnt-cleanup/apps/app_userevent.c
    team/file/usecnt-cleanup/apps/app_verbose.c
    team/file/usecnt-cleanup/apps/app_waitforring.c
    team/file/usecnt-cleanup/apps/app_waitforsilence.c
    team/file/usecnt-cleanup/apps/app_while.c
    team/file/usecnt-cleanup/apps/app_zapateller.c
    team/file/usecnt-cleanup/apps/app_zapbarge.c
    team/file/usecnt-cleanup/apps/app_zapras.c
    team/file/usecnt-cleanup/apps/app_zapscan.c
    team/file/usecnt-cleanup/codecs/codec_a_mu.c
    team/file/usecnt-cleanup/codecs/codec_adpcm.c
    team/file/usecnt-cleanup/codecs/codec_alaw.c
    team/file/usecnt-cleanup/codecs/codec_g722.c
    team/file/usecnt-cleanup/codecs/codec_g726.c
    team/file/usecnt-cleanup/codecs/codec_gsm.c
    team/file/usecnt-cleanup/codecs/codec_ilbc.c
    team/file/usecnt-cleanup/codecs/codec_lpc10.c
    team/file/usecnt-cleanup/codecs/codec_speex.c
    team/file/usecnt-cleanup/codecs/codec_ulaw.c
    team/file/usecnt-cleanup/codecs/codec_zap.c
    team/file/usecnt-cleanup/funcs/func_base64.c
    team/file/usecnt-cleanup/funcs/func_blacklist.c
    team/file/usecnt-cleanup/funcs/func_callerid.c
    team/file/usecnt-cleanup/funcs/func_cdr.c
    team/file/usecnt-cleanup/funcs/func_channel.c
    team/file/usecnt-cleanup/funcs/func_cut.c
    team/file/usecnt-cleanup/funcs/func_db.c
    team/file/usecnt-cleanup/funcs/func_enum.c
    team/file/usecnt-cleanup/funcs/func_env.c
    team/file/usecnt-cleanup/funcs/func_global.c
    team/file/usecnt-cleanup/funcs/func_groupcount.c
    team/file/usecnt-cleanup/funcs/func_logic.c
    team/file/usecnt-cleanup/funcs/func_math.c
    team/file/usecnt-cleanup/funcs/func_md5.c
    team/file/usecnt-cleanup/funcs/func_module.c
    team/file/usecnt-cleanup/funcs/func_rand.c
    team/file/usecnt-cleanup/funcs/func_realtime.c
    team/file/usecnt-cleanup/funcs/func_sha1.c
    team/file/usecnt-cleanup/funcs/func_shell.c
    team/file/usecnt-cleanup/funcs/func_strings.c
    team/file/usecnt-cleanup/funcs/func_timeout.c
    team/file/usecnt-cleanup/funcs/func_uri.c
    team/file/usecnt-cleanup/funcs/func_version.c
    team/file/usecnt-cleanup/funcs/func_vmcount.c

Modified: team/file/usecnt-cleanup/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_adsiprog.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_adsiprog.c (original)
+++ team/file/usecnt-cleanup/apps/app_adsiprog.c Wed Feb 14 18:50:30 2007
@@ -1565,21 +1565,9 @@
 	return res;
 }
 
-static int unload_module(void)
-{
-	int res;
-
-	ast_module_user_hangup_all();
-
-	res = ast_unregister_application(app);	
-	
-
-	return res;
-}
-
 static int load_module(void)
 {
 	return ast_register_application(app, adsi_exec, synopsis, descrip, ast_module_info->self);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Asterisk ADSI Programming Application");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Asterisk ADSI Programming Application");

Modified: team/file/usecnt-cleanup/apps/app_alarmreceiver.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_alarmreceiver.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_alarmreceiver.c (original)
+++ team/file/usecnt-cleanup/apps/app_alarmreceiver.c Wed Feb 14 18:50:30 2007
@@ -814,22 +814,6 @@
 
 }
 
-/*
-* These functions are required to implement an Asterisk App.
-*/
-
-
-static int unload_module(void)
-{
-	int res;
-
-	res = ast_unregister_application(app);
-
-	ast_module_user_hangup_all();
-
-	return res;
-}
-
 static int load_module(void)
 {
 	if(load_config())
@@ -838,4 +822,4 @@
 		return AST_MODULE_LOAD_DECLINE;
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Alarm Receiver for Asterisk");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Alarm Receiver for Asterisk");

Modified: team/file/usecnt-cleanup/apps/app_amd.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_amd.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_amd.c (original)
+++ team/file/usecnt-cleanup/apps/app_amd.c Wed Feb 14 18:50:30 2007
@@ -368,12 +368,6 @@
 	return;
 }
 
-static int unload_module(void)
-{
-	ast_module_user_hangup_all();
-	return ast_unregister_application(app);
-}
-
 static int load_module(void)
 {
 	load_config();
@@ -388,6 +382,5 @@
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Answering Machine Detection Application",
 		.load = load_module,
-		.unload = unload_module,
 		.reload = reload,
 	       );

Modified: team/file/usecnt-cleanup/apps/app_authenticate.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_authenticate.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_authenticate.c (original)
+++ team/file/usecnt-cleanup/apps/app_authenticate.c Wed Feb 14 18:50:30 2007
@@ -225,21 +225,9 @@
 	return res;
 }
 
-static int unload_module(void)
-{
-	int res;
-
-	ast_module_user_hangup_all();
-
-	res = ast_unregister_application(app);
-
-	
-	return res;
-}
-
 static int load_module(void)
 {
 	return ast_register_application(app, auth_exec, synopsis, descrip, ast_module_info->self);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Authentication Application");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Authentication Application");

Modified: team/file/usecnt-cleanup/apps/app_cdr.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_cdr.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_cdr.c (original)
+++ team/file/usecnt-cleanup/apps/app_cdr.c Wed Feb 14 18:50:30 2007
@@ -53,20 +53,9 @@
 	return 0;
 }
 
-static int unload_module(void)
-{
-	int res;
-
-	res = ast_unregister_application(nocdr_app);
-
-	ast_module_user_hangup_all();
-
-	return res;
-}
-
 static int load_module(void)
 {
 	return ast_register_application(nocdr_app, nocdr_exec, nocdr_synopsis, nocdr_descrip, ast_module_info->self);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Tell Asterisk to not maintain a CDR for the current call");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Tell Asterisk to not maintain a CDR for the current call");

Modified: team/file/usecnt-cleanup/apps/app_chanisavail.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_chanisavail.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_chanisavail.c (original)
+++ team/file/usecnt-cleanup/apps/app_chanisavail.c Wed Feb 14 18:50:30 2007
@@ -158,20 +158,9 @@
 	return 0;
 }
 
-static int unload_module(void)
-{
-	int res = 0;
-
-	res = ast_unregister_application(app);
-
-	ast_module_user_hangup_all();
-	
-	return res;
-}
-
 static int load_module(void)
 {
 	return ast_register_application(app, chanavail_exec, synopsis, descrip, ast_module_info->self);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Check channel availability");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Check channel availability");

Modified: team/file/usecnt-cleanup/apps/app_channelredirect.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_channelredirect.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_channelredirect.c (original)
+++ team/file/usecnt-cleanup/apps/app_channelredirect.c Wed Feb 14 18:50:30 2007
@@ -117,20 +117,9 @@
 	return res;
 }
 
-static int unload_module(void)
-{
-	int res;
-
-	res = ast_unregister_application(app);
-
-	ast_module_user_hangup_all();
-
-	return res;	
-}
-
 static int load_module(void)
 {
 	return ast_register_application(app, asyncgoto_exec, synopsis, descrip, ast_module_info->self);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Channel Redirect");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Channel Redirect");

Modified: team/file/usecnt-cleanup/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_chanspy.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_chanspy.c (original)
+++ team/file/usecnt-cleanup/apps/app_chanspy.c Wed Feb 14 18:50:30 2007
@@ -708,18 +708,6 @@
 	return res;
 }
 
-static int unload_module(void)
-{
-	int res = 0;
-
-	res |= ast_unregister_application(app_chan);
-	res |= ast_unregister_application(app_ext);
-
-	ast_module_user_hangup_all();
-
-	return res;
-}
-
 static int load_module(void)
 {
 	int res = 0;
@@ -730,4 +718,4 @@
 	return res;
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Listen to the audio of an active channel");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Listen to the audio of an active channel");

Modified: team/file/usecnt-cleanup/apps/app_controlplayback.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_controlplayback.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_controlplayback.c (original)
+++ team/file/usecnt-cleanup/apps/app_controlplayback.c Wed Feb 14 18:50:30 2007
@@ -147,16 +147,9 @@
 	return res;
 }
 
-static int unload_module(void)
-{
-	int res;
-	res = ast_unregister_application(app);
-	return res;
-}
-
 static int load_module(void)
 {
 	return ast_register_application(app, controlplayback_exec, synopsis, descrip, ast_module_info->self);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Control Playback Application");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Control Playback Application");

Modified: team/file/usecnt-cleanup/apps/app_db.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_db.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_db.c (original)
+++ team/file/usecnt-cleanup/apps/app_db.c Wed Feb 14 18:50:30 2007
@@ -135,16 +135,6 @@
 	return 0;
 }
 
-static int unload_module(void)
-{
-	int retval;
-
-	retval = ast_unregister_application(dt_app);
-	retval |= ast_unregister_application(d_app);
-
-	return retval;
-}
-
 static int load_module(void)
 {
 	int retval;
@@ -155,4 +145,4 @@
 	return retval;
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Database Access Functions");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Database Access Functions");

Modified: team/file/usecnt-cleanup/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_dial.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_dial.c (original)
+++ team/file/usecnt-cleanup/apps/app_dial.c Wed Feb 14 18:50:30 2007
@@ -1812,18 +1812,6 @@
 	return res;
 }
 
-static int unload_module(void)
-{
-	int res;
-
-	res = ast_unregister_application(app);
-	res |= ast_unregister_application(rapp);
-
-	ast_module_user_hangup_all();
-	
-	return res;
-}
-
 static int load_module(void)
 {
 	int res;
@@ -1834,4 +1822,4 @@
 	return res;
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Dialing Application");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Dialing Application");

Modified: team/file/usecnt-cleanup/apps/app_dictate.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_dictate.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_dictate.c (original)
+++ team/file/usecnt-cleanup/apps/app_dictate.c Wed Feb 14 18:50:30 2007
@@ -329,16 +329,9 @@
 	return res;
 }
 
-static int unload_module(void)
-{
-	int res;
-	res = ast_unregister_application(app);
-	return res;
-}
-
 static int load_module(void)
 {
 	return ast_register_application(app, dictate_exec, synopsis, desc, ast_module_info->self);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Virtual Dictation Machine");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Virtual Dictation Machine");

Modified: team/file/usecnt-cleanup/apps/app_directed_pickup.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_directed_pickup.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_directed_pickup.c (original)
+++ team/file/usecnt-cleanup/apps/app_directed_pickup.c Wed Feb 14 18:50:30 2007
@@ -159,18 +159,9 @@
 	return res;
 }
 
-static int unload_module(void)
-{
-	int res;
-
-	res = ast_unregister_application(app);
-	
-	return res;
-}
-
 static int load_module(void)
 {
 	return ast_register_application(app, pickup_exec, synopsis, descrip, ast_module_info->self);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Directed Call Pickup Application");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Directed Call Pickup Application");

Modified: team/file/usecnt-cleanup/apps/app_directory.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_directory.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_directory.c (original)
+++ team/file/usecnt-cleanup/apps/app_directory.c Wed Feb 14 18:50:30 2007
@@ -639,13 +639,6 @@
 	return res;
 }
 
-static int unload_module(void)
-{
-	int res;
-	res = ast_unregister_application(app);
-	return res;
-}
-
 static int load_module(void)
 {
 #ifdef USE_ODBC_STORAGE
@@ -670,4 +663,4 @@
 	return ast_register_application(app, directory_exec, synopsis, descrip, ast_module_info->self);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Extension Directory");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Extension Directory");

Modified: team/file/usecnt-cleanup/apps/app_disa.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_disa.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_disa.c (original)
+++ team/file/usecnt-cleanup/apps/app_disa.c Wed Feb 14 18:50:30 2007
@@ -370,20 +370,9 @@
 	return -1;
 }
 
-static int unload_module(void)
-{
-	int res;
-
-	res = ast_unregister_application(app);
-
-	ast_module_user_hangup_all();
-
-	return res;
-}
-
 static int load_module(void)
 {
 	return ast_register_application(app, disa_exec, synopsis, descrip, ast_module_info->self);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "DISA (Direct Inward System Access) Application");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "DISA (Direct Inward System Access) Application");

Modified: team/file/usecnt-cleanup/apps/app_dumpchan.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_dumpchan.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_dumpchan.c (original)
+++ team/file/usecnt-cleanup/apps/app_dumpchan.c Wed Feb 14 18:50:30 2007
@@ -152,20 +152,9 @@
 	return 0;
 }
 
-static int unload_module(void)
-{
-	int res;
-
-	res = ast_unregister_application(app);
-
-	ast_module_user_hangup_all();
-
-	return res;
-}
-
 static int load_module(void)
 {
 	return ast_register_application(app, dumpchan_exec, synopsis, desc, ast_module_info->self);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Dump Info About The Calling Channel");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Dump Info About The Calling Channel");

Modified: team/file/usecnt-cleanup/apps/app_exec.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_exec.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_exec.c (original)
+++ team/file/usecnt-cleanup/apps/app_exec.c Wed Feb 14 18:50:30 2007
@@ -182,19 +182,6 @@
 	return res;
 }
 
-static int unload_module(void)
-{
-	int res;
-
-	res = ast_unregister_application(app_exec);
-	res |= ast_unregister_application(app_tryexec);
-	res |= ast_unregister_application(app_execif);
-
-	ast_module_user_hangup_all();
-
-	return res;
-}
-
 static int load_module(void)
 {
 	int res = ast_register_application(app_exec, exec_exec, exec_synopsis, exec_descrip, ast_module_info->self);
@@ -203,4 +190,4 @@
 	return res;
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Executes dialplan applications");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Executes dialplan applications");

Modified: team/file/usecnt-cleanup/apps/app_externalivr.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_externalivr.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_externalivr.c (original)
+++ team/file/usecnt-cleanup/apps/app_externalivr.c Wed Feb 14 18:50:30 2007
@@ -570,20 +570,9 @@
 	return res;
 }
 
-static int unload_module(void)
-{
-	int res;
-
-	res = ast_unregister_application(app);
-
-	ast_module_user_hangup_all();
-
-	return res;
-}
-
 static int load_module(void)
 {
 	return ast_register_application(app, app_exec, synopsis, descrip, ast_module_info->self);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "External IVR Interface Application");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "External IVR Interface Application");

Modified: team/file/usecnt-cleanup/apps/app_festival.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_festival.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_festival.c (original)
+++ team/file/usecnt-cleanup/apps/app_festival.c Wed Feb 14 18:50:30 2007
@@ -536,17 +536,6 @@
 
 }
 
-static int unload_module(void)
-{
-	int res;
-
-	res = ast_unregister_application(app);
-
-	ast_module_user_hangup_all();
-
-	return res;
-}
-
 static int load_module(void)
 {
 	struct ast_config *cfg = ast_config_load(FESTIVAL_CONFIG);
@@ -558,4 +547,4 @@
 	return ast_register_application(app, festival_exec, synopsis, descrip, ast_module_info->self);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Simple Festival Interface");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Simple Festival Interface");

Modified: team/file/usecnt-cleanup/apps/app_flash.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_flash.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_flash.c (original)
+++ team/file/usecnt-cleanup/apps/app_flash.c Wed Feb 14 18:50:30 2007
@@ -100,21 +100,10 @@
 	return res;
 }
 
-static int unload_module(void)
-{
-	int res;
-
-	res = ast_unregister_application(app);
-
-	ast_module_user_hangup_all();
-
-	return res;
-}
-
 static int load_module(void)
 {
 	return ast_register_application(app, flash_exec, synopsis, descrip, ast_module_info->self);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Flash channel application");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Flash channel application");
 

Modified: team/file/usecnt-cleanup/apps/app_forkcdr.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_forkcdr.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_forkcdr.c (original)
+++ team/file/usecnt-cleanup/apps/app_forkcdr.c Wed Feb 14 18:50:30 2007
@@ -91,20 +91,9 @@
 	return res;
 }
 
-static int unload_module(void)
-{
-	int res;
-
-	res = ast_unregister_application(app);
-
-	ast_module_user_hangup_all();
-
-	return res;	
-}
-
 static int load_module(void)
 {
 	return ast_register_application(app, forkcdr_exec, synopsis, descrip, ast_module_info->self);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Fork The CDR into 2 separate entities");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Fork The CDR into 2 separate entities");

Modified: team/file/usecnt-cleanup/apps/app_getcpeid.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_getcpeid.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_getcpeid.c (original)
+++ team/file/usecnt-cleanup/apps/app_getcpeid.c Wed Feb 14 18:50:30 2007
@@ -125,20 +125,9 @@
 	return res;
 }
 
-static int unload_module(void)
-{
-	int res;
-
-	res = ast_unregister_application(app);
-
-	ast_module_user_hangup_all();
-
-	return res;	
-}
-
 static int load_module(void)
 {
 	return ast_register_application(app, cpeid_exec, synopsis, descrip, ast_module_info->self);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Get ADSI CPE ID");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Get ADSI CPE ID");

Modified: team/file/usecnt-cleanup/apps/app_ices.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_ices.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_ices.c (original)
+++ team/file/usecnt-cleanup/apps/app_ices.c Wed Feb 14 18:50:30 2007
@@ -198,20 +198,9 @@
 	return res;
 }
 
-static int unload_module(void)
-{
-	int res;
-
-	res = ast_unregister_application(app);
-
-	ast_module_user_hangup_all();
-
-	return res;
-}
-
 static int load_module(void)
 {
 	return ast_register_application(app, ices_exec, synopsis, descrip, ast_module_info->self);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Encode and Stream via icecast and ices");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Encode and Stream via icecast and ices");

Modified: team/file/usecnt-cleanup/apps/app_image.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_image.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_image.c (original)
+++ team/file/usecnt-cleanup/apps/app_image.c Wed Feb 14 18:50:30 2007
@@ -100,20 +100,9 @@
 	return res;
 }
 
-static int unload_module(void)
-{
-	int res;
-
-	res = ast_unregister_application(app);
-
-	ast_module_user_hangup_all();
-
-	return res; 
-}
-
 static int load_module(void)
 {
 	return ast_register_application(app, sendimage_exec, synopsis, descrip, ast_module_info->self);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Image Transmission Application");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Image Transmission Application");

Modified: team/file/usecnt-cleanup/apps/app_ivrdemo.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_ivrdemo.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_ivrdemo.c (original)
+++ team/file/usecnt-cleanup/apps/app_ivrdemo.c Wed Feb 14 18:50:30 2007
@@ -113,20 +113,9 @@
 	return res;
 }
 
-static int unload_module(void)
-{
-	int res;
-	
-	res = ast_unregister_application(app);
-
-	ast_module_user_hangup_all();
-	
-	return res;
-}
-
 static int load_module(void)
 {
 	return ast_register_application(app, skel_exec, tdesc, synopsis);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "IVR Demo Application");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "IVR Demo Application");

Modified: team/file/usecnt-cleanup/apps/app_macro.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_macro.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_macro.c (original)
+++ team/file/usecnt-cleanup/apps/app_macro.c Wed Feb 14 18:50:30 2007
@@ -393,20 +393,6 @@
 	return MACRO_EXIT_RESULT;
 }
 
-static int unload_module(void)
-{
-	int res;
-
-	res = ast_unregister_application(if_app);
-	res |= ast_unregister_application(exit_app);
-	res |= ast_unregister_application(app);
-	res |= ast_unregister_application(exclusive_app);
-
-	ast_module_user_hangup_all();
-
-	return res;
-}
-
 static int load_module(void)
 {
 	int res;
@@ -419,4 +405,4 @@
 	return res;
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Extension Macros");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Extension Macros");

Modified: team/file/usecnt-cleanup/apps/app_milliwatt.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_milliwatt.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_milliwatt.c (original)
+++ team/file/usecnt-cleanup/apps/app_milliwatt.c Wed Feb 14 18:50:30 2007
@@ -129,20 +129,9 @@
 	return -1;
 }
 
-static int unload_module(void)
-{
-	int res;
-
-	res = ast_unregister_application(app);
-
-	ast_module_user_hangup_all();
-
-	return res;
-}
-
 static int load_module(void)
 {
 	return ast_register_application(app, milliwatt_exec, synopsis, descrip, ast_module_info->self);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Digital Milliwatt (mu-law) Test Application");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Digital Milliwatt (mu-law) Test Application");

Modified: team/file/usecnt-cleanup/apps/app_mixmonitor.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_mixmonitor.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_mixmonitor.c (original)
+++ team/file/usecnt-cleanup/apps/app_mixmonitor.c Wed Feb 14 18:50:30 2007
@@ -423,19 +423,6 @@
 	complete_mixmonitor_cli },
 };
 
-static int unload_module(void)
-{
-	int res;
-
-	ast_cli_unregister_multiple(cli_mixmonitor, sizeof(cli_mixmonitor) / sizeof(struct ast_cli_entry));
-	res = ast_unregister_application(stop_app);
-	res |= ast_unregister_application(app);
-	
-	ast_module_user_hangup_all();
-
-	return res;
-}
-
 static int load_module(void)
 {
 	int res;
@@ -447,4 +434,4 @@
 	return res;
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Mixed Audio Monitoring Application");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Mixed Audio Monitoring Application");

Modified: team/file/usecnt-cleanup/apps/app_morsecode.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_morsecode.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_morsecode.c (original)
+++ team/file/usecnt-cleanup/apps/app_morsecode.c Wed Feb 14 18:50:30 2007
@@ -153,20 +153,9 @@
 	return res;
 }
 
-static int unload_module(void)
-{
-	int res;
-
-	res = ast_unregister_application(app_morsecode);
-
-	ast_module_user_hangup_all();
-
-	return res;
-}
-
 static int load_module(void)
 {
 	return ast_register_application(app_morsecode, morsecode_exec, morsecode_synopsis, morsecode_descrip, ast_module_info->self);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Morse code");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Morse code");

Modified: team/file/usecnt-cleanup/apps/app_mp3.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_mp3.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_mp3.c (original)
+++ team/file/usecnt-cleanup/apps/app_mp3.c Wed Feb 14 18:50:30 2007
@@ -233,20 +233,9 @@
 	return res;
 }
 
-static int unload_module(void)
-{
-	int res;
-
-	res = ast_unregister_application(app);
-
-	ast_module_user_hangup_all();
-	
-	return res;
-}
-
 static int load_module(void)
 {
 	return ast_register_application(app, mp3_exec, synopsis, descrip, ast_module_info->self);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Silly MP3 Application");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Silly MP3 Application");

Modified: team/file/usecnt-cleanup/apps/app_nbscat.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_nbscat.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_nbscat.c (original)
+++ team/file/usecnt-cleanup/apps/app_nbscat.c Wed Feb 14 18:50:30 2007
@@ -215,20 +215,9 @@
 	return res;
 }
 
-static int unload_module(void)
-{
-	int res;
-
-	res = ast_unregister_application(app);
-
-	ast_module_user_hangup_all();
-
-	return res;
-}
-
 static int load_module(void)
 {
 	return ast_register_application(app, NBScat_exec, synopsis, descrip, ast_module_info->self);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Silly NBS Stream Application");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Silly NBS Stream Application");

Modified: team/file/usecnt-cleanup/apps/app_page.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_page.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_page.c (original)
+++ team/file/usecnt-cleanup/apps/app_page.c Wed Feb 14 18:50:30 2007
@@ -187,21 +187,10 @@
 	return -1;
 }
 
-static int unload_module(void)
-{
-	int res;
-
-	res =  ast_unregister_application(app_page);
-
-	ast_module_user_hangup_all();
-
-	return res;
-}
-
 static int load_module(void)
 {
 	return ast_register_application(app_page, page_exec, page_synopsis, page_descrip, ast_module_info->self);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Page Multiple Phones");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Page Multiple Phones");
 

Modified: team/file/usecnt-cleanup/apps/app_parkandannounce.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_parkandannounce.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_parkandannounce.c (original)
+++ team/file/usecnt-cleanup/apps/app_parkandannounce.c Wed Feb 14 18:50:30 2007
@@ -229,21 +229,10 @@
 	return res;
 }
 
-static int unload_module(void)
-{
-	int res;
-
-	res = ast_unregister_application(app);
-
-	ast_module_user_hangup_all();
-
-	return res;
-}
-
 static int load_module(void)
 {
 	/* return ast_register_application(app, park_exec); */
 	return ast_register_application(app, parkandannounce_exec, synopsis, descrip, ast_module_info->self);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Call Parking and Announce Application");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Call Parking and Announce Application");

Modified: team/file/usecnt-cleanup/apps/app_privacy.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_privacy.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_privacy.c (original)
+++ team/file/usecnt-cleanup/apps/app_privacy.c Wed Feb 14 18:50:30 2007
@@ -207,20 +207,9 @@
 	return 0;
 }
 
-static int unload_module(void)
-{
-	int res;
-
-	res = ast_unregister_application (app);
-
-	ast_module_user_hangup_all();
-
-	return res;
-}
-
 static int load_module(void)
 {
 	return ast_register_application (app, privacy_exec, synopsis, descrip, ast_module_info->self);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Require phone number to be entered, if no CallerID sent");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Require phone number to be entered, if no CallerID sent");

Modified: team/file/usecnt-cleanup/apps/app_read.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_read.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_read.c (original)
+++ team/file/usecnt-cleanup/apps/app_read.c Wed Feb 14 18:50:30 2007
@@ -210,20 +210,9 @@
 	return res;
 }
 
-static int unload_module(void)
-{
-	int res;
-
-	res = ast_unregister_application(app);
-	
-	ast_module_user_hangup_all();
-
-	return res;	
-}
-
 static int load_module(void)
 {
 	return ast_register_application(app, read_exec, synopsis, descrip, ast_module_info->self);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Read Variable Application");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Read Variable Application");

Modified: team/file/usecnt-cleanup/apps/app_readfile.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_readfile.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_readfile.c (original)
+++ team/file/usecnt-cleanup/apps/app_readfile.c Wed Feb 14 18:50:30 2007
@@ -95,21 +95,9 @@
 	return res;
 }
 
-
-static int unload_module(void)
-{
-	int res;
-
-	res = ast_unregister_application(app_readfile);
-	
-	ast_module_user_hangup_all();
-
-	return res;	
-}
-
 static int load_module(void)
 {
 	return ast_register_application(app_readfile, readfile_exec, readfile_synopsis, readfile_descrip, ast_module_info->self);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Stores output of file into a variable");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Stores output of file into a variable");

Modified: team/file/usecnt-cleanup/apps/app_record.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_record.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_record.c (original)
+++ team/file/usecnt-cleanup/apps/app_record.c Wed Feb 14 18:50:30 2007
@@ -358,20 +358,9 @@
 	return res;
 }
 
-static int unload_module(void)
-{
-	int res;
-
-	res = ast_unregister_application(app);
-	
-	ast_module_user_hangup_all();
-
-	return res;	
-}
-
 static int load_module(void)
 {
 	return ast_register_application(app, record_exec, synopsis, descrip, ast_module_info->self);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Trivial Record Application");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Trivial Record Application");

Modified: team/file/usecnt-cleanup/apps/app_sayunixtime.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_sayunixtime.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_sayunixtime.c (original)
+++ team/file/usecnt-cleanup/apps/app_sayunixtime.c Wed Feb 14 18:50:30 2007
@@ -96,18 +96,6 @@
 	return res;
 }
 
-static int unload_module(void)
-{
-	int res;
-	
-	res = ast_unregister_application(app_sayunixtime);
-	res |= ast_unregister_application(app_datetime);
-
-	ast_module_user_hangup_all();
-	
-	return res;
-}
-
 static int load_module(void)
 {
 	int res;
@@ -118,4 +106,4 @@
 	return res;
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Say time");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Say time");

Modified: team/file/usecnt-cleanup/apps/app_sendtext.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_sendtext.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_sendtext.c (original)
+++ team/file/usecnt-cleanup/apps/app_sendtext.c Wed Feb 14 18:50:30 2007
@@ -105,20 +105,9 @@
 	return 0;
 }
 
-static int unload_module(void)
-{
-	int res;
-	
-	res = ast_unregister_application(app);
-	
-	ast_module_user_hangup_all();
-
-	return res;	
-}
-
 static int load_module(void)
 {
 	return ast_register_application(app, sendtext_exec, synopsis, descrip, ast_module_info->self);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Send Text Applications");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Send Text Applications");

Modified: team/file/usecnt-cleanup/apps/app_setcallerid.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/apps/app_setcallerid.c?view=diff&rev=54526&r1=54525&r2=54526
==============================================================================
--- team/file/usecnt-cleanup/apps/app_setcallerid.c (original)
+++ team/file/usecnt-cleanup/apps/app_setcallerid.c Wed Feb 14 18:50:30 2007
@@ -85,16 +85,9 @@
 	return 0;
 }
 
-static int unload_module(void)
-{
-	int res = ast_unregister_application(app2);
-	ast_module_user_hangup_all();
-	return res;
-}
-
 static int load_module(void)
 {
 	return ast_register_application(app2, setcallerid_pres_exec, synopsis2, descrip2, ast_module_info->self);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Set CallerID Presentation Application");
+AST_MODULE_INFO_MINIMAL(ASTERISK_GPL_KEY, "Set CallerID Presentation Application");

Modified: team/file/usecnt-cleanup/apps/app_sms.c

[... 1522 lines stripped ...]


More information about the asterisk-commits mailing list