ben.carrasco/freeswitch
1
0 Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-10-15 15:54:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into smgmaster

Browse Source 
Conflicts:
	src/switch_console.c
This commit is contained in:
Moises Silva committed 2011-05-22 17:53:14 -04:00
2 parents 9d964b5767 9e3c258fe2
commit 950e936111
296 files changed
+11586 -7566
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/switch_loadable_module.c
+4 -2
View File
@@ -945,6 +945,8 @@ static switch_status_t switch_loadable_module_load_file(char *path, char *filena
*new_module = module;
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Successfully Loaded [%s]\n", module_interface->module_name);
switch_core_set_signal_handlers();
return SWITCH_STATUS_SUCCESS;
}
@@ -1679,11 +1681,11 @@ SWITCH_DECLARE(int) switch_loadable_module_get_codecs_sorted(const switch_codec_
switch_mutex_lock(loadable_modules.mutex);
for (x = 0; x < preflen; x++) {
char *cur, *last = NULL, *next = NULL, *name, *p, buf[256];
char *cur, *next = NULL, *name, *p, buf[256];
uint32_t interval = 0, rate = 0, bit = 0;
switch_copy_string(buf, prefs[x], sizeof(buf));
last = name = next = cur = buf;
name = next = cur = buf;
for (;;) {
if (!next) {