It is no longer required for each module that deals with a channel to call ast_module_user_hangup_all in it's unload function. The loader will automatically perform this action for it.

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@75183 f38db490-d61c-443f-a65b-d21fe96a405b

6 files changed, 4 insertions, 21 deletions

diff --git a/funcs/func_blacklist.c b/funcs/func_blacklist.c
index d3f829d10..30e916d59 100644
--- 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 38c63196c..802bbb4a0 100644
--- 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 9cab185b2..7afd978ca 100644
--- 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 6e5e0c0d4..ff7ab4f21 100644
--- 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 47d51bf64..7ffe8122c 100644
--- 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 3cb5029e5..7f0282c32 100644
--- 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)