It is no longer required for each module that deals with a channel to call ast_module...

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75183 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index b07a950a26ec45e657563c46a1cbf6c0f2359e21..4729bcd99d8c49bded7f22f486e22aa7975e1ed0 100644 (file)
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -1572,14 +1572,7 @@ static int adsi_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res;
-
-       ast_module_user_hangup_all();
-
-       res = ast_unregister_application(app);  
-       
-
-       return res;
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c
index f74abb8a64392c2ef5de9ac876d16d872adae8d8..0b695eb162d5a797cda01efffc9ad2bd29a59b2e 100644 (file)
--- a/apps/app_alarmreceiver.c
+++ b/apps/app_alarmreceiver.c
@@ -823,13 +823,7 @@ static int load_config(void)
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application(app);
-
-       ast_module_user_hangup_all();
-
-       return res;
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_amd.c b/apps/app_amd.c
index 59bc5ab8a732b57945b42027262cbb288112e7aa..6c753783d8d8744ffaa3cc25e0008f1e3df4f992 100644 (file)
--- a/apps/app_amd.c
+++ b/apps/app_amd.c
@@ -383,7 +383,6 @@ static void load_config(void)
 
 static int unload_module(void)
 {
-       ast_module_user_hangup_all();
        return ast_unregister_application(app);
 }
 

diff --git a/apps/app_authenticate.c b/apps/app_authenticate.c
index be9cba8bf6cc17008e313f5efd7a3de3a945c06a..4cd85ce4f24e0c1d6082ea18135558cae0bef270 100644 (file)
--- a/apps/app_authenticate.c
+++ b/apps/app_authenticate.c
@@ -223,14 +223,7 @@ static int auth_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res;
-
-       ast_module_user_hangup_all();
-
-       res = ast_unregister_application(app);
-
-       
-       return res;
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_cdr.c b/apps/app_cdr.c
index c0d88fbbbc53d8f938b54154a81f9e51dffd4e79..23044de80e8bec1ca89eded613cd328bfcedbedf 100644 (file)
--- a/apps/app_cdr.c
+++ b/apps/app_cdr.c
@@ -61,13 +61,7 @@ static int nocdr_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application(nocdr_app);
-
-       ast_module_user_hangup_all();
-
-       return res;
+       return ast_unregister_application(nocdr_app);
 }
 
 static int load_module(void)

diff --git a/apps/app_chanisavail.c b/apps/app_chanisavail.c
index 13b9197bb903a4f68aa23ce42791b99e7cc9d059..dbcc9b4d99b412f70daee634085d03f285c416ce 100644 (file)
--- a/apps/app_chanisavail.c
+++ b/apps/app_chanisavail.c
@@ -157,13 +157,7 @@ static int chanavail_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res = 0;
-
-       res = ast_unregister_application(app);
-
-       ast_module_user_hangup_all();
-       
-       return res;
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_channelredirect.c b/apps/app_channelredirect.c
index bba90b9390f57b5f8510da0f323dabc60ad2a04a..a67918aad0ce9937571238b77dcbf7bacbd11443 100644 (file)
--- a/apps/app_channelredirect.c
+++ b/apps/app_channelredirect.c
@@ -122,13 +122,7 @@ static int asyncgoto_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application(app);
-
-       ast_module_user_hangup_all();
-
-       return res;     
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index 03a6322f898a72a538b29f6bcd9b964239841d0c..fc3f4b920e2c4d703f0eec4814390b81ff049db3 100644 (file)
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -799,8 +799,6 @@ static int unload_module(void)
        res |= ast_unregister_application(app_chan);
        res |= ast_unregister_application(app_ext);
 
-       ast_module_user_hangup_all();
-
        return res;
 }
 

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 8751d65ea4708a2d92662e769a3b8fdaa3996995..7ee3e3272a0ff2745c5de1e6066d3bae81e00a8c 100644 (file)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -1946,8 +1946,6 @@ static int unload_module(void)
        res = ast_unregister_application(app);
        res |= ast_unregister_application(rapp);
 
-       ast_module_user_hangup_all();
-
        if ((con = ast_context_find("app_dial_gosub_virtual_context"))) {
                ast_context_remove_extension2(con, "s", 1, NULL);
        }

diff --git a/apps/app_disa.c b/apps/app_disa.c
index 137fee3d0c3f13f70d8cc39ba13af05c08bb580d..99d4f97eba3350e1eb7f5a80d8226429b06d1eb5 100644 (file)
--- a/apps/app_disa.c
+++ b/apps/app_disa.c
@@ -388,13 +388,7 @@ reorder:
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application(app);
-
-       ast_module_user_hangup_all();
-
-       return res;
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_dumpchan.c b/apps/app_dumpchan.c
index 8fca2b64ac94bd10c1cf64ea87b1aed8b56c94e1..29ad21a592ce24a4463dd5f6558c70b59dec6bb4 100644 (file)
--- a/apps/app_dumpchan.c
+++ b/apps/app_dumpchan.c
@@ -165,13 +165,7 @@ static int dumpchan_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application(app);
-
-       ast_module_user_hangup_all();
-
-       return res;
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_echo.c b/apps/app_echo.c
index 14f7c6d650daa04701044b14f024cd3208b610d4..6110f53694420b5927c4e31f8fe2f1470e00bfd1 100644 (file)
--- a/apps/app_echo.c
+++ b/apps/app_echo.c
@@ -87,13 +87,7 @@ end:
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application(app);
-
-       ast_module_user_hangup_all();
-
-       return res;
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_exec.c b/apps/app_exec.c
index 507045cc3227bcc37c7e48c740e28ada2f43aa16..32298d03cba29ba71eab48ab422f2bf9cbc68e88 100644 (file)
--- a/apps/app_exec.c
+++ b/apps/app_exec.c
@@ -207,8 +207,6 @@ static int unload_module(void)
        res |= ast_unregister_application(app_tryexec);
        res |= ast_unregister_application(app_execif);
 
-       ast_module_user_hangup_all();
-
        return res;
 }
 

diff --git a/apps/app_externalivr.c b/apps/app_externalivr.c
index f08e42ac29f242bfeb7f5c14cf1e24e955432200..e5778edba54444e96d3841c95f46927b8fc229a9 100644 (file)
--- a/apps/app_externalivr.c
+++ b/apps/app_externalivr.c
@@ -578,13 +578,7 @@ static int app_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application(app);
-
-       ast_module_user_hangup_all();
-
-       return res;
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_festival.c b/apps/app_festival.c
index 6a8a26f541087dc5a05c1dfc440a6fbc2a952ac2..d43c3aa16ef650f004986b72d16fda6466e0bdbd 100644 (file)
--- a/apps/app_festival.c
+++ b/apps/app_festival.c
@@ -536,13 +536,7 @@ static int festival_exec(struct ast_channel *chan, void *vdata)
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application(app);
-
-       ast_module_user_hangup_all();
-
-       return res;
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_flash.c b/apps/app_flash.c
index 5f90093bb02e40dd0bf8dab13cb671c5945ff9a7..2497419a2698cc6cb7e9895acb328399cb6ca02e 100644 (file)
--- a/apps/app_flash.c
+++ b/apps/app_flash.c
@@ -111,13 +111,7 @@ static int flash_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application(app);
-
-       ast_module_user_hangup_all();
-
-       return res;
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_followme.c b/apps/app_followme.c
index 3e9c90aa421bc7c17c1e0c3d5f77b0d98f5bdc72..a97f402129d2bb8420d8e0a09dc36d8874ce641c 100644 (file)
--- a/apps/app_followme.c
+++ b/apps/app_followme.c
@@ -1052,8 +1052,6 @@ static int unload_module(void)
 {
        struct call_followme *f;
 
-       ast_module_user_hangup_all();
-
        ast_unregister_application(app);
 
        /* Free Memory. Yeah! I'm free! */

diff --git a/apps/app_forkcdr.c b/apps/app_forkcdr.c
index d9c5b293f40b68d8918a50c374170def2a9f8cfe..a58ca9a83bd0271c0ab8a6e609829307f2bb63a9 100644 (file)
--- a/apps/app_forkcdr.c
+++ b/apps/app_forkcdr.c
@@ -97,13 +97,7 @@ static int forkcdr_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application(app);
-
-       ast_module_user_hangup_all();
-
-       return res;     
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c
index f0c5d1b07af52d8754c8420f301f5ef6c088d64e..fd19e4a3137619be335a51906ea34dfa6af93079 100644 (file)
--- a/apps/app_getcpeid.c
+++ b/apps/app_getcpeid.c
@@ -131,13 +131,7 @@ static int cpeid_exec(struct ast_channel *chan, void *idata)
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application(app);
-
-       ast_module_user_hangup_all();
-
-       return res;     
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_ices.c b/apps/app_ices.c
index c4bee4c5ff149ec33cdd49d5bb5de62e083d8007..233ac6b13e2e02eb199f03db9774a2e65091fd1f 100644 (file)
--- a/apps/app_ices.c
+++ b/apps/app_ices.c
@@ -208,13 +208,7 @@ static int ices_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application(app);
-
-       ast_module_user_hangup_all();
-
-       return res;
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_image.c b/apps/app_image.c
index 6ec8bec7128d04b4ee07c679ac7f3d941d358e14..6f35ea1109d546a4fc5d58acef08802cb177645e 100644 (file)
--- a/apps/app_image.c
+++ b/apps/app_image.c
@@ -99,13 +99,7 @@ static int sendimage_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application(app);
-
-       ast_module_user_hangup_all();
-
-       return res; 
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_ivrdemo.c b/apps/app_ivrdemo.c
index 933ae9040fe7ab4bccd83027315044510dc1c111..e28e94d2c435965ac96684049fe2e30fb196685e 100644 (file)
--- a/apps/app_ivrdemo.c
+++ b/apps/app_ivrdemo.c
@@ -115,13 +115,7 @@ static int skel_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res;
-       
-       res = ast_unregister_application(app);
-
-       ast_module_user_hangup_all();
-       
-       return res;
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_macro.c b/apps/app_macro.c
index 53a012cdb45a9a270df10649b59f3e54514f6802..01556d3a766109c4e62a70c9112665423462ac29 100644 (file)
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -536,8 +536,6 @@ static int unload_module(void)
        res |= ast_unregister_application(app);
        res |= ast_unregister_application(exclusive_app);
 
-       ast_module_user_hangup_all();
-
        return res;
 }
 

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 5c75e8606859ce94c5f7061ce0580e474ba34ac0..65c8d6c96d98ac8c4553bae9800370fc8fa94067 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -4972,8 +4972,6 @@ static int unload_module(void)
 
        ast_devstate_prov_del("Meetme");
        ast_devstate_prov_del("SLA");
-
-       ast_module_user_hangup_all();
        
        sla_destroy();
 

diff --git a/apps/app_milliwatt.c b/apps/app_milliwatt.c
index 31ded36d6dbd18c1d237158df6577b8867524a62..89ef375451f27ba312aadbc31979e9af13c1d4b9 100644 (file)
--- a/apps/app_milliwatt.c
+++ b/apps/app_milliwatt.c
@@ -140,13 +140,7 @@ static int milliwatt_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application(app);
-
-       ast_module_user_hangup_all();
-
-       return res;
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_minivm.c b/apps/app_minivm.c
index 75bb8dfcb6e241f41e060d59e340dd09d66fa17d..f0a2f08bbfc5c5f3b07cf3d76745c6d600875441 100644 (file)
--- a/apps/app_minivm.c
+++ b/apps/app_minivm.c
@@ -3130,9 +3130,6 @@ static int unload_module(void)
        timezone_destroy_list();        /* Destroy list of timezones */
        vmaccounts_destroy_list();      /* Destroy list of voicemail accounts */
 
-       
-       ast_module_user_hangup_all();
-
        return res;
 }
 

diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c
index e24f62fdbc6eeb9fb2ad42c101444eaf937ef9b7..308f82b4d6eabe6ce377c32000cd5dbec6a4fef6 100644 (file)
--- a/apps/app_mixmonitor.c
+++ b/apps/app_mixmonitor.c
@@ -450,8 +450,6 @@ static int unload_module(void)
        res = ast_unregister_application(stop_app);
        res |= ast_unregister_application(app);
        
-       ast_module_user_hangup_all();
-
        return res;
 }
 

diff --git a/apps/app_morsecode.c b/apps/app_morsecode.c
index cd42112318d8ddf56e99271f000c1ad122ce9829..61c4fe4bd620f6c6028bb24fecca70df84e0285e 100644 (file)
--- a/apps/app_morsecode.c
+++ b/apps/app_morsecode.c
@@ -161,13 +161,7 @@ static int morsecode_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application(app_morsecode);
-
-       ast_module_user_hangup_all();
-
-       return res;
+       return ast_unregister_application(app_morsecode);
 }
 
 static int load_module(void)

diff --git a/apps/app_mp3.c b/apps/app_mp3.c
index b0539e17b88750c1b2e4ae16b202b9d4b7ae695d..2656a6b791ef9e690edea5899e99fbed7408072a 100644 (file)
--- a/apps/app_mp3.c
+++ b/apps/app_mp3.c
@@ -238,13 +238,7 @@ static int mp3_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application(app);
-
-       ast_module_user_hangup_all();
-       
-       return res;
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_nbscat.c b/apps/app_nbscat.c
index 6a922ecd205af779f3aa0f7b55f019204738f547..ca2b61f8bcec380aeda9eb50135bf43ccdd7c5af 100644 (file)
--- a/apps/app_nbscat.c
+++ b/apps/app_nbscat.c
@@ -220,13 +220,7 @@ static int NBScat_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application(app);
-
-       ast_module_user_hangup_all();
-
-       return res;
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c
index dd5116fd5301ae815c6a9f783addaf20c869e099..ce1417ec9690edb9744effa84359123767e446e1 100644 (file)
--- a/apps/app_osplookup.c
+++ b/apps/app_osplookup.c
@@ -2049,8 +2049,6 @@ static int unload_module(void)
        ast_cli_unregister_multiple(cli_osp, sizeof(cli_osp) / sizeof(struct ast_cli_entry));
        osp_unload();
 
-       ast_module_user_hangup_all();
-
        return res;
 }
 

diff --git a/apps/app_page.c b/apps/app_page.c
index f6dab7a545e6b9989ac44f86d0208295cfbe54bf..8ee48bd2953a2e53cc45ff3eb4cfbc6f566f5338 100644 (file)
--- a/apps/app_page.c
+++ b/apps/app_page.c
@@ -195,13 +195,7 @@ static int page_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res;
-
-       res =  ast_unregister_application(app_page);
-
-       ast_module_user_hangup_all();
-
-       return res;
+       return ast_unregister_application(app_page);
 }
 
 static int load_module(void)

diff --git a/apps/app_parkandannounce.c b/apps/app_parkandannounce.c
index b4e9006fb39b780a8b3812ec18a5a8139b053cce..fe63da9e1a83a71f1e04d5e6f49976a261907130 100644 (file)
--- a/apps/app_parkandannounce.c
+++ b/apps/app_parkandannounce.c
@@ -242,13 +242,7 @@ static int parkandannounce_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application(app);
-
-       ast_module_user_hangup_all();
-
-       return res;
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_playback.c b/apps/app_playback.c
index a476dd92c6d9c39c5cd5db7bc5189ee86751fed3..345f07ecea7abc07fe5b6d3ff1fb389e104fa1d8 100644 (file)
--- a/apps/app_playback.c
+++ b/apps/app_playback.c
@@ -462,8 +462,6 @@ static int unload_module(void)
 
        ast_cli_unregister_multiple(cli_playback, sizeof(cli_playback) / sizeof(struct ast_cli_entry));
 
-       ast_module_user_hangup_all();
-
        if (say_cfg)
                ast_config_destroy(say_cfg);
 

diff --git a/apps/app_privacy.c b/apps/app_privacy.c
index 4a61b3189b2fc6cf1c4e45784d10328bfbcc93e4..000c9ef2ae97af3913d6530e71a476f462f11a14 100644 (file)
--- a/apps/app_privacy.c
+++ b/apps/app_privacy.c
@@ -206,18 +206,12 @@ static int privacy_exec (struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application (app);
-
-       ast_module_user_hangup_all();
-
-       return res;
+       return ast_unregister_application (app);
 }
 
 static int load_module(void)
 {
-       return ast_register_application (app, privacy_exec, synopsis, descrip);
+       return ast_register_application(app, privacy_exec, synopsis, descrip);
 }
 
 AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Require phone number to be entered, if no CallerID sent");

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 21f91455cf88f6ad119a6a0b965f3b69f6df692a..1d30086da6316b27a8c5d431c9e6cf90c9c5c8ad 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -4784,8 +4784,6 @@ static int unload_module(void)
                ast_context_remove_extension2(con, "s", 1, NULL);
        }
 
-       ast_module_user_hangup_all();
-
        clear_and_free_interfaces();
 
        return res;

diff --git a/apps/app_read.c b/apps/app_read.c
index cde03c63755a8a7757b0915b9534c355a671bb12..b2354bb33c9be46978fd0f45b9d0d8a6ec4a79a4 100644 (file)
--- a/apps/app_read.c
+++ b/apps/app_read.c
@@ -218,13 +218,7 @@ static int read_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application(app);
-       
-       ast_module_user_hangup_all();
-
-       return res;     
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_readfile.c b/apps/app_readfile.c
index 62221570c5010aaef00be5b6e51a9b9349832e51..be25aac92099a63e41ce8379c7ac495fa73c3479 100644 (file)
--- a/apps/app_readfile.c
+++ b/apps/app_readfile.c
@@ -103,13 +103,7 @@ static int readfile_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application(app_readfile);
-       
-       ast_module_user_hangup_all();
-
-       return res;     
+       return ast_unregister_application(app_readfile);
 }
 
 static int load_module(void)

diff --git a/apps/app_record.c b/apps/app_record.c
index b5e85a616d45dc7bb7fb43f664675d680b67bb3f..8475791e38e0f42d324742033f72100b5d705ef8 100644 (file)
--- a/apps/app_record.c
+++ b/apps/app_record.c
@@ -375,13 +375,7 @@ static int record_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application(app);
-       
-       ast_module_user_hangup_all();
-
-       return res;     
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_rpt.c b/apps/app_rpt.c
index cc979f6d39b37832a40134d87554efe67afc0002..d67b5eef34116df54a4c2c423efbfb81f5c55b70 100644 (file)
--- a/apps/app_rpt.c
+++ b/apps/app_rpt.c
@@ -7437,7 +7437,6 @@ static int unload_module(void)
 {
        int i;
 
-       ast_module_user_hangup_all();
        for (i = 0; i < nrpts; i++) {
                if (!strcmp(rpt_vars[i].name, rpt_vars[i].p.nodes))
                        continue;

diff --git a/apps/app_sayunixtime.c b/apps/app_sayunixtime.c
index 2e9c9b323546e00d7a3bca8da2148aba2583ec3d..0cb2406aee86ba8aa502b497d8ad8e5e6f29ac93 100644 (file)
--- a/apps/app_sayunixtime.c
+++ b/apps/app_sayunixtime.c
@@ -107,8 +107,6 @@ static int unload_module(void)
        
        res = ast_unregister_application(app_sayunixtime);
        res |= ast_unregister_application(app_datetime);
-
-       ast_module_user_hangup_all();
        
        return res;
 }

diff --git a/apps/app_senddtmf.c b/apps/app_senddtmf.c
index e48ba4fe069b074a170a9d064187f531f25f5d23..987fac2f950950242ada0ea29bfeada31d313594 100644 (file)
--- a/apps/app_senddtmf.c
+++ b/apps/app_senddtmf.c
@@ -125,8 +125,6 @@ static int unload_module(void)
        res = ast_unregister_application(app);
        res |= ast_manager_unregister("PlayDTMF");
 
-       ast_module_user_hangup_all();
-
        return res;     
 }
 

diff --git a/apps/app_sendtext.c b/apps/app_sendtext.c
index f9bbc9918e0ff9e86e1f9fa83b78e85596f4e619..bb3ca180de8b389ef7d7677d9094ed53f33e753f 100644 (file)
--- a/apps/app_sendtext.c
+++ b/apps/app_sendtext.c
@@ -104,13 +104,7 @@ static int sendtext_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res;
-       
-       res = ast_unregister_application(app);
-       
-       ast_module_user_hangup_all();
-
-       return res;     
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_setcallerid.c b/apps/app_setcallerid.c
index 59b4d9af8c13e9d5102b78b6162b54fc32c98224..daf97c72802683823759d3c8cc0a9dbfd6c1a900 100644 (file)
--- a/apps/app_setcallerid.c
+++ b/apps/app_setcallerid.c
@@ -92,9 +92,7 @@ static int setcallerid_pres_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res = ast_unregister_application(app2);
-       ast_module_user_hangup_all();
-       return res;
+       return ast_unregister_application(app2);
 }
 
 static int load_module(void)

diff --git a/apps/app_sms.c b/apps/app_sms.c
index a6fb5abfca5dbdff3192cc0c75a50ea7df5d7895..710ba82c56a39caebe627bdd8acb2f5a8068f97f 100644 (file)
--- a/apps/app_sms.c
+++ b/apps/app_sms.c
@@ -1929,13 +1929,7 @@ done:
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application(app);
-       
-       ast_module_user_hangup_all();
-
-       return res;     
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_softhangup.c b/apps/app_softhangup.c
index 018edc07d7066fbfa1d62d28d5cc6f284b8cef1e..a011c322534096e81db46669718c14d0f2d6b12d 100644 (file)
--- a/apps/app_softhangup.c
+++ b/apps/app_softhangup.c
@@ -104,13 +104,7 @@ static int softhangup_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application(app);
-
-       ast_module_user_hangup_all();
-
-       return res;     
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_speech_utils.c b/apps/app_speech_utils.c
index 30d1737f3c44f67d529fe72af43af98036536640..b8dd634fdd65df9400236372bfb32915a8a1a868 100644 (file)
--- a/apps/app_speech_utils.c
+++ b/apps/app_speech_utils.c
@@ -823,8 +823,6 @@ static int unload_module(void)
        res |= ast_custom_function_unregister(&speech_engine_function);
        res |= ast_custom_function_unregister(&speech_results_type_function);
 
-       ast_module_user_hangup_all();
-
        return res;     
 }
 

diff --git a/apps/app_stack.c b/apps/app_stack.c
index d54dd2a596b81319848d6ab3dc1529d12e2665ce..4e4d78aec1fef217942729447d8ebfcf8e746ea4 100644 (file)
--- a/apps/app_stack.c
+++ b/apps/app_stack.c
@@ -421,8 +421,6 @@ static int unload_module(void)
        ast_unregister_application(app_gosub);
        ast_custom_function_unregister(&local_function);
 
-       ast_module_user_hangup_all();
-
        return 0;
 }
 

diff --git a/apps/app_system.c b/apps/app_system.c
index 382133bfe8d49e327f31c0f67a1e5f25fc9d40da..57870de3c3366515d395c864a9741bb8e58653df 100644 (file)
--- a/apps/app_system.c
+++ b/apps/app_system.c
@@ -123,8 +123,6 @@ static int unload_module(void)
 
        res = ast_unregister_application(app);
        res |= ast_unregister_application(app2);
-       
-       ast_module_user_hangup_all();
 
        return res;
 }

diff --git a/apps/app_talkdetect.c b/apps/app_talkdetect.c
index b261d402f7825bc6420cae19fc1a3c2ee75532b6..6cd8572bb36446bf351c2705c59e08ea1e68afd3 100644 (file)
--- a/apps/app_talkdetect.c
+++ b/apps/app_talkdetect.c
@@ -211,13 +211,7 @@ static int background_detect_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application(app);
-       
-       ast_module_user_hangup_all();
-
-       return res;     
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_test.c b/apps/app_test.c
index 7941351567f5582323041ecdd9c6568bf25b8272..4ffd6a7ad7f298d1efbfbaf7ec70a204934038fa 100644 (file)
--- a/apps/app_test.c
+++ b/apps/app_test.c
@@ -465,8 +465,6 @@ static int unload_module(void)
        res = ast_unregister_application(testc_app);
        res |= ast_unregister_application(tests_app);
 
-       ast_module_user_hangup_all();
-
        return res;     
 }
 

diff --git a/apps/app_transfer.c b/apps/app_transfer.c
index 4d918f67b468d3334daa7a593bd2ab1c77b582e5..76655cedebf2db656e470125dd5be774e5bba77c 100644 (file)
--- a/apps/app_transfer.c
+++ b/apps/app_transfer.c
@@ -131,13 +131,7 @@ static int transfer_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application(app);
-
-       ast_module_user_hangup_all();
-
-       return res;     
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_url.c b/apps/app_url.c
index 96787a96716c0e8badf030ca8919d63ef3f027ac..f24d5492ad28bfe2e10518056201acd70fc57115 100644 (file)
--- a/apps/app_url.c
+++ b/apps/app_url.c
@@ -145,13 +145,7 @@ out:
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application(app);
-       
-       ast_module_user_hangup_all();
-
-       return res;     
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_userevent.c b/apps/app_userevent.c
index df7bc58a79fabf436ed716f0be85c14a66dc7464..64c0d9ae93ba299c64648cc8a8e24804db01eccb 100644 (file)
--- a/apps/app_userevent.c
+++ b/apps/app_userevent.c
@@ -92,13 +92,7 @@ static int userevent_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application(app);
-
-       ast_module_user_hangup_all();
-
-       return res;     
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_verbose.c b/apps/app_verbose.c
index f9bcfd1161998480ac27c828b49f7865c229dca8..c94ba290eb564bed57646db7b4886edc980a648f 100644 (file)
--- a/apps/app_verbose.c
+++ b/apps/app_verbose.c
@@ -150,8 +150,6 @@ static int unload_module(void)
        res = ast_unregister_application(app_verbose);
        res |= ast_unregister_application(app_log);
 
-       ast_module_user_hangup_all();
-
        return res;     
 }
 

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 54d312b043a1f9101430c9908c95339e9f5a357f..1277cc3174d16116f8fb4a5787f94b0371baf7e9 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -8501,8 +8501,6 @@ static int unload_module(void)
        res |= ast_manager_unregister("VoicemailUsersList");
        ast_cli_unregister_multiple(cli_voicemail, sizeof(cli_voicemail) / sizeof(struct ast_cli_entry));
        ast_uninstall_vm_functions();
-       
-       ast_module_user_hangup_all();
 
        if (poll_thread != AST_PTHREADT_NULL)
                stop_poll_thread();

diff --git a/apps/app_waitforring.c b/apps/app_waitforring.c
index d59644baca6020454eb6346736653fa5c36c4c52..50d96f52ff744c27f00b94868fee14b61d4761df 100644 (file)
--- a/apps/app_waitforring.c
+++ b/apps/app_waitforring.c
@@ -120,13 +120,7 @@ static int waitforring_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application(app);
-
-       ast_module_user_hangup_all();
-
-       return res;     
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_waitforsilence.c b/apps/app_waitforsilence.c
index c74bfd960d924c1214e9df90e33fe48925bb9de0..a6a7650c6f1cf4c3f0dd776b1e056375bbb0d71d 100644 (file)
--- a/apps/app_waitforsilence.c
+++ b/apps/app_waitforsilence.c
@@ -187,13 +187,7 @@ static int waitforsilence_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application(app);
-       
-       ast_module_user_hangup_all();
-
-       return res;
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_while.c b/apps/app_while.c
index ddc581ed96c08dcfada11146f6ef7ff30e106d1c..3733d3bdc77c1c210c18291b595d2addc737c1df 100644 (file)
--- a/apps/app_while.c
+++ b/apps/app_while.c
@@ -315,8 +315,6 @@ static int unload_module(void)
        res |= ast_unregister_application(exit_app);
        res |= ast_unregister_application(continue_app);
 
-       ast_module_user_hangup_all();
-
        return res;
 }
 

diff --git a/apps/app_zapateller.c b/apps/app_zapateller.c
index 7355670b619ffe224cf46975cb5dc621a196ccdf..283556a9e7fb716ec5fcc437008f7dcff0abb7dc 100644 (file)
--- a/apps/app_zapateller.c
+++ b/apps/app_zapateller.c
@@ -105,13 +105,7 @@ static int zapateller_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application(app);
-       
-       ast_module_user_hangup_all();
-
-       return res;     
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_zapbarge.c b/apps/app_zapbarge.c
index 201ae78de032642af8ec2422c2a247a1a5d2044b..c8b86559c4f158a82d585ab2445c3c08c8a595c8 100644 (file)
--- a/apps/app_zapbarge.c
+++ b/apps/app_zapbarge.c
@@ -300,13 +300,7 @@ out:
 
 static int unload_module(void)
 {
-       int res;
-       
-       res = ast_unregister_application(app);
-       
-       ast_module_user_hangup_all();
-
-       return res;     
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_zapras.c b/apps/app_zapras.c
index 6191327b2f547deb566a81f232d885a6232b0867..2aa0a30eff3c6e45367d0b00b28811b170763323 100644 (file)
--- a/apps/app_zapras.c
+++ b/apps/app_zapras.c
@@ -241,13 +241,7 @@ static int zapras_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void) 
 {
-       int res;
-
-       res = ast_unregister_application(app);
-       
-       ast_module_user_hangup_all();
-
-       return res;
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/apps/app_zapscan.c b/apps/app_zapscan.c
index 17d84a6a037017c631a08272c5ae5e1904d6730a..e95f7f5577b212d34849b8954195cc4febb3bec7 100644 (file)
--- a/apps/app_zapscan.c
+++ b/apps/app_zapscan.c
@@ -363,13 +363,7 @@ static int conf_exec(struct ast_channel *chan, void *data)
 
 static int unload_module(void)
 {
-       int res;
-
-       res = ast_unregister_application(app);
-       
-       ast_module_user_hangup_all();
-
-       return res;
+       return ast_unregister_application(app);
 }
 
 static int load_module(void)

diff --git a/funcs/func_blacklist.c b/funcs/func_blacklist.c
index d3f829d10858bd69ee12441244ed6eccb4047a24..30e916d59f3cef9f018152fd54a2eaeba70d3595 100644 (file)
--- a/funcs/func_blacklist.c
+++ b/funcs/func_blacklist.c
@@ -75,9 +75,7 @@ static struct ast_custom_function blacklist_function = {
 
 static int unload_module(void)
 {
-       int res = ast_custom_function_unregister(&blacklist_function);
-       ast_module_user_hangup_all();
-       return res;     
+       return ast_custom_function_unregister(&blacklist_function);
 }
 
 static int load_module(void)

diff --git a/funcs/func_curl.c b/funcs/func_curl.c
index 38c63196c6e2f82f23135e972b197ebe50f3b190..802bbb4a071d8225f7a20f147f3e12acabecd591 100644 (file)
--- a/funcs/func_curl.c
+++ b/funcs/func_curl.c
@@ -187,8 +187,6 @@ static int unload_module(void)
 
        res = ast_custom_function_unregister(&acf_curl);
 
-       ast_module_user_hangup_all();
-
        curl_global_cleanup();
        
        return res;

diff --git a/funcs/func_cut.c b/funcs/func_cut.c
index 9cab185b2dadae811dcd0519c2174eaf9333790f..7afd978cab457e7e19187431b462ea955d7b46c7 100644 (file)
--- a/funcs/func_cut.c
+++ b/funcs/func_cut.c
@@ -306,8 +306,6 @@ static int unload_module(void)
        res |= ast_custom_function_unregister(&acf_cut);
        res |= ast_custom_function_unregister(&acf_sort);
 
-       ast_module_user_hangup_all();
-
        return res;
 }
 

diff --git a/funcs/func_enum.c b/funcs/func_enum.c
index 6e5e0c0d4a1a33197ba22fec850406908f396b9d..ff7ab4f2137ec99769f4c29c04ae5d332c99c402 100644 (file)
--- a/funcs/func_enum.c
+++ b/funcs/func_enum.c
@@ -392,8 +392,6 @@ static int unload_module(void)
        res |= ast_custom_function_unregister(&enum_function);
        res |= ast_custom_function_unregister(&txtcidname_function);
 
-       ast_module_user_hangup_all();
-
        return res;
 }
 

diff --git a/funcs/func_realtime.c b/funcs/func_realtime.c
index 47d51bf647557e2fc32448af6b34eb4ef819c1b1..7ffe8122cbf0e5fb95c8d75ce7bfbc5bb2282eaa 100644 (file)
--- a/funcs/func_realtime.c
+++ b/funcs/func_realtime.c
@@ -148,18 +148,12 @@ struct ast_custom_function realtime_function = {
 
 static int unload_module(void)
 {
-       int res = ast_custom_function_unregister(&realtime_function);
-
-       ast_module_user_hangup_all();
-
-       return res;
+       return ast_custom_function_unregister(&realtime_function);
 }
 
 static int load_module(void)
 {
-       int res = ast_custom_function_register(&realtime_function);
-
-       return res;
+       return ast_custom_function_register(&realtime_function);
 }
 
 AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Read/Write values from a RealTime repository");

diff --git a/funcs/func_vmcount.c b/funcs/func_vmcount.c
index 3cb5029e56e555b0d846acfd0b38b9f662cc8d19..7f0282c3232e840c440442fab92ae4a346884d0d 100644 (file)
--- a/funcs/func_vmcount.c
+++ b/funcs/func_vmcount.c
@@ -90,10 +90,7 @@ struct ast_custom_function acf_vmcount = {
 
 static int unload_module(void)
 {
-       int res = ast_custom_function_unregister(&acf_vmcount);
-       ast_module_user_hangup_all();
-
-       return res;
+       return ast_custom_function_unregister(&acf_vmcount);
 }
 
 static int load_module(void)

diff --git a/res/res_agi.c b/res/res_agi.c
index 72683e6910e95ca433cb4840341d28f396e3f881..a69239936a06bd14944184ee91cdaa7f58b0c98a 100644 (file)
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -2138,7 +2138,6 @@ static struct ast_cli_entry cli_agi[] = {
 
 static int unload_module(void)
 {
-       ast_module_user_hangup_all();
        ast_cli_unregister_multiple(cli_agi, sizeof(cli_agi) / sizeof(struct ast_cli_entry));
        ast_unregister_application(eapp);
        ast_unregister_application(deadapp);

diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c
index 158b40f67f1ace160267dd1883941626c7dff986..28c8c316e035131473b0e574db99279306c82d3d 100644 (file)
--- a/res/res_config_odbc.c
+++ b/res/res_config_odbc.c
@@ -575,7 +575,6 @@ static struct ast_config_engine odbc_engine = {
 
 static int unload_module (void)
 {
-       ast_module_user_hangup_all();
        ast_config_engine_deregister(&odbc_engine);
        if (option_verbose)
                ast_verbose("res_config_odbc unloaded.\n");

diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c
index e8993dd8671fda7629e7c76b492e85c977095da6..4b9c1898f4b77c4726044d092c14d3febe87ce4f 100644 (file)
--- a/res/res_config_pgsql.c
+++ b/res/res_config_pgsql.c
@@ -573,8 +573,6 @@ static int unload_module(void)
                ast_verbose("Postgresql RealTime unloaded.\n");
        }
 
-       ast_module_user_hangup_all();
-
        /* Unlock so something else can destroy the lock. */
        ast_mutex_unlock(&pgsql_lock);
 

diff --git a/res/res_features.c b/res/res_features.c
index 3e31df24f1ba39ec4391a5449212d2310f3b7963..3f71bfadfeb380be78292a5bbc3ba5392b58f82d 100644 (file)
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -3051,8 +3051,6 @@ static int load_module(void)
 
 static int unload_module(void)
 {
-       ast_module_user_hangup_all();
-
        ast_manager_unregister("ParkedCalls");
        ast_manager_unregister("Bridge");
        ast_manager_unregister("Park");

diff --git a/res/res_realtime.c b/res/res_realtime.c
index 28525f44870b914c3cc11d5fc0d5a6cb2b661370..3981e74f147cfa38c0f5a894ae3018ecc43897ff 100644 (file)
--- a/res/res_realtime.c
+++ b/res/res_realtime.c
@@ -114,7 +114,6 @@ static struct ast_cli_entry cli_realtime[] = {
 static int unload_module(void)
 {
        ast_cli_unregister_multiple(cli_realtime, sizeof(cli_realtime) / sizeof(struct ast_cli_entry));
-       ast_module_user_hangup_all();
        return 0;
 }