kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-18 15:49:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res/res_corosync: Always decline module load, instead of failing"

Browse Source
This commit is contained in:
Matt Jordan
2015-06-29 10:39:00 -05:00
committed by Gerrit Code Review
parent 892cc5625f 80d97290bb
commit d66c059fbc
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/res_corosync.c
View File

@@ -863,7 +863,6 @@ static void cleanup_module(void)
static int load_module(void) static int load_module(void)
{ {
cs_error_t cs_err; cs_error_t cs_err;
enum ast_module_load_result res = AST_MODULE_LOAD_FAILURE;
struct cpg_name name; struct cpg_name name;
corosync_aggregate_topic = stasis_topic_create("corosync_aggregate_topic"); corosync_aggregate_topic = stasis_topic_create("corosync_aggregate_topic");
@@ -885,7 +884,6 @@ static int load_module(void)
if (load_config(0)) { if (load_config(0)) {
/* simply not configured is not a fatal error */ /* simply not configured is not a fatal error */
res = AST_MODULE_LOAD_DECLINE;
goto failed; goto failed;
} }
@@ -926,7 +924,7 @@ static int load_module(void)
failed: failed:
cleanup_module(); cleanup_module();
return res; return AST_MODULE_LOAD_DECLINE;
} }
static int unload_module(void) static int unload_module(void)