mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-11 12:07:06 +00:00
(MDXMLINT-36) don't add module interfaces before returning from error conditions in module load functions
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10072 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
1 parent
9f70152968
commit
78fe4073e1
4 files changed
+13
-16
No files matched your search
@@ -5290,11 +5290,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_conference_load)
|
||||
}
|
||||
api_syntax = p;
|
||||
|
||||
SWITCH_ADD_API(api_interface, "conference", "Conference module commands", conf_api_main, p);
|
||||
SWITCH_ADD_APP(app_interface, global_app_name, global_app_name, NULL, conference_function, NULL, SAF_NONE);
|
||||
SWITCH_ADD_APP(app_interface, "conference_set_auto_outcall", "conference_set_auto_outcall", NULL, conference_auto_function, NULL, SAF_NONE);
|
||||
SWITCH_ADD_CHAT(chat_interface, CONF_CHAT_PROTO, chat_send);
|
||||
|
||||
/* create/register custom event message type */
|
||||
if (switch_event_reserve_subclass(CONF_EVENT_MAINT) != SWITCH_STATUS_SUCCESS) {
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!\n", CONF_EVENT_MAINT);
|
||||
@@ -5316,6 +5311,11 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_conference_load)
|
||||
return SWITCH_STATUS_GENERR;
|
||||
}
|
||||
|
||||
SWITCH_ADD_API(api_interface, "conference", "Conference module commands", conf_api_main, p);
|
||||
SWITCH_ADD_APP(app_interface, global_app_name, global_app_name, NULL, conference_function, NULL, SAF_NONE);
|
||||
SWITCH_ADD_APP(app_interface, "conference_set_auto_outcall", "conference_set_auto_outcall", NULL, conference_auto_function, NULL, SAF_NONE);
|
||||
SWITCH_ADD_CHAT(chat_interface, CONF_CHAT_PROTO, chat_send);
|
||||
|
||||
send_presence(SWITCH_EVENT_PRESENCE_IN);
|
||||
|
||||
globals.running = 1;
|
||||
|
||||
Reference in new issue
Block a user