From 2c5aaeed09dfddfa8b5fe7a0ebf7b1848343bbea Mon Sep 17 00:00:00 2001
From: George Joseph <gjoseph@digium.com>
Date: Wed, 12 Apr 2017 06:47:59 -0600
Subject: [PATCH] modules:  change module LOAD_FAILUREs to LOAD_DECLINES (14)

Change-Id: If99e3b4fc2d7e86fc3e61182aa6c835b407ed49e
---
 formats/format_ogg_speex.c                    | 31 ++++++++++---------
 res/res_ari_events.c                          |  5 ++-
 res/res_http_media_cache.c                    |  4 +--
 .../res_ari_resource.c.mustache               |  5 ++-
 tests/test_media_cache.c                      |  2 +-
 5 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/formats/format_ogg_speex.c b/formats/format_ogg_speex.c
index 6152e9c52e..52ac7cf387 100644
--- a/formats/format_ogg_speex.c
+++ b/formats/format_ogg_speex.c
@@ -314,21 +314,6 @@ static struct ast_format_def speex32_f = {
 	.desc_size = sizeof(struct speex_desc),
 };
 
-static int load_module(void)
-{
-	speex_f.format = ast_format_speex;
-	speex16_f.format = ast_format_speex16;
-	speex32_f.format = ast_format_speex32;
-
-	if (ast_format_def_register(&speex_f) ||
-	    ast_format_def_register(&speex16_f) ||
-	    ast_format_def_register(&speex32_f)) {
-		return AST_MODULE_LOAD_FAILURE;
-	}
-
-	return AST_MODULE_LOAD_SUCCESS;
-}
-
 static int unload_module(void)
 {
 	int res = 0;
@@ -338,6 +323,22 @@ static int unload_module(void)
 	return res;
 }
 
+static int load_module(void)
+{
+	speex_f.format = ast_format_speex;
+	speex16_f.format = ast_format_speex16;
+	speex32_f.format = ast_format_speex32;
+
+	if (ast_format_def_register(&speex_f) ||
+	    ast_format_def_register(&speex16_f) ||
+	    ast_format_def_register(&speex32_f)) {
+		unload_module();
+		return AST_MODULE_LOAD_DECLINE;
+	}
+
+	return AST_MODULE_LOAD_SUCCESS;
+}
+
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "OGG/Speex audio",
 	.load = load_module,
 	.unload = unload_module,
diff --git a/res/res_ari_events.c b/res/res_ari_events.c
index f6817b1a39..832708f4d8 100644
--- a/res/res_ari_events.c
+++ b/res/res_ari_events.c
@@ -424,6 +424,7 @@ static int unload_module(void)
 	ast_ari_remove_handler(&events);
 	ao2_cleanup(events.ws_server);
 	events.ws_server = NULL;
+	ast_ari_websocket_events_event_websocket_dtor();
 	stasis_app_unref();
 	return 0;
 }
@@ -434,11 +435,12 @@ static int load_module(void)
 	struct ast_websocket_protocol *protocol;
 
 	if (ast_ari_websocket_events_event_websocket_init() == -1) {
-		return AST_MODULE_LOAD_FAILURE;
+		return AST_MODULE_LOAD_DECLINE;
 	}
 
 	events.ws_server = ast_websocket_server_create();
 	if (!events.ws_server) {
+		ast_ari_websocket_events_event_websocket_dtor();
 		return AST_MODULE_LOAD_DECLINE;
 	}
 
@@ -446,6 +448,7 @@ static int load_module(void)
 	if (!protocol) {
 		ao2_ref(events.ws_server, -1);
 		events.ws_server = NULL;
+		ast_ari_websocket_events_event_websocket_dtor();
 		return AST_MODULE_LOAD_DECLINE;
 	}
 	protocol->session_attempted = ast_ari_events_event_websocket_ws_attempted_cb;
diff --git a/res/res_http_media_cache.c b/res/res_http_media_cache.c
index 2207b96ddd..991abfb965 100644
--- a/res/res_http_media_cache.c
+++ b/res/res_http_media_cache.c
@@ -427,13 +427,13 @@ static int load_module(void)
 	if (ast_bucket_scheme_register("http", &http_bucket_wizard, &http_bucket_file_wizard,
 			NULL, NULL)) {
 		ast_log(LOG_ERROR, "Failed to register Bucket HTTP wizard scheme implementation\n");
-		return AST_MODULE_LOAD_FAILURE;
+		return AST_MODULE_LOAD_DECLINE;
 	}
 
 	if (ast_bucket_scheme_register("https", &https_bucket_wizard, &https_bucket_file_wizard,
 			NULL, NULL)) {
 		ast_log(LOG_ERROR, "Failed to register Bucket HTTPS wizard scheme implementation\n");
-		return AST_MODULE_LOAD_FAILURE;
+		return AST_MODULE_LOAD_DECLINE;
 	}
 
 	return AST_MODULE_LOAD_SUCCESS;
diff --git a/rest-api-templates/res_ari_resource.c.mustache b/rest-api-templates/res_ari_resource.c.mustache
index f58adcd9ee..883f1fdca6 100644
--- a/rest-api-templates/res_ari_resource.c.mustache
+++ b/rest-api-templates/res_ari_resource.c.mustache
@@ -265,6 +265,7 @@ static int unload_module(void)
 {{#has_websocket}}
 	ao2_cleanup({{full_name}}.ws_server);
 	{{full_name}}.ws_server = NULL;
+	ast_ari_websocket_events_event_websocket_dtor();
 {{/has_websocket}}
 {{/apis}}
 	stasis_app_unref();
@@ -280,11 +281,12 @@ static int load_module(void)
 	struct ast_websocket_protocol *protocol;
 
 	if (ast_ari_websocket_{{c_name}}_{{c_nickname}}_init() == -1) {
-		return AST_MODULE_LOAD_FAILURE;
+		return AST_MODULE_LOAD_DECLINE;
 	}
 
 	{{full_name}}.ws_server = ast_websocket_server_create();
 	if (!{{full_name}}.ws_server) {
+		ast_ari_websocket_events_event_websocket_dtor();
 		return AST_MODULE_LOAD_DECLINE;
 	}
 
@@ -292,6 +294,7 @@ static int load_module(void)
 	if (!protocol) {
 		ao2_ref({{full_name}}.ws_server, -1);
 		{{full_name}}.ws_server = NULL;
+		ast_ari_websocket_events_event_websocket_dtor();
 		return AST_MODULE_LOAD_DECLINE;
 	}
 	protocol->session_attempted = ast_ari_{{c_name}}_{{c_nickname}}_ws_attempted_cb;
diff --git a/tests/test_media_cache.c b/tests/test_media_cache.c
index 685693c364..ca1e2dd568 100644
--- a/tests/test_media_cache.c
+++ b/tests/test_media_cache.c
@@ -399,7 +399,7 @@ static int load_module(void)
 	if (ast_bucket_scheme_register("httptest", &bucket_test_wizard,
 		&bucket_file_test_wizard, NULL, NULL)) {
 		ast_log(LOG_ERROR, "Failed to register Bucket HTTP test wizard scheme implementation\n");
-		return AST_MODULE_LOAD_FAILURE;
+		return AST_MODULE_LOAD_DECLINE;
 	}
 
 	AST_TEST_REGISTER(exists_nominal);