kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-22 20:56:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge config updates (bug #3406)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4889 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-01-25 06:10:20 +00:00
parent a611ce04f1
commit 5f726ad8c7
49 changed files with 881 additions and 856 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
channels/chan_phone.c
View File

@@ -1232,7 +1232,7 @@ int load_module()
struct phone_pvt *tmp;
int mode = MODE_IMMEDIATE;
int txgain = DEFAULT_GAIN, rxgain = DEFAULT_GAIN; /* default gain 1.0 */
cfg = ast_load(config);
cfg = ast_config_load(config);
/* We *must* have a config file otherwise stop immediately */
if (!cfg) {
@@ -1255,7 +1255,7 @@ int load_module()
} else {
ast_log(LOG_ERROR, "Unable to register channel '%s'\n", v->value);
ast_destroy(cfg);
ast_config_destroy(cfg);
ast_mutex_unlock(&iflock);
__unload_module();
return -1;
@@ -1316,11 +1316,11 @@ int load_module()
AST_FORMAT_G723_1 | AST_FORMAT_SLINEAR |
AST_FORMAT_ULAW : prefformat, phone_request)) {
ast_log(LOG_ERROR, "Unable to register channel class %s\n", type);
ast_destroy(cfg);
ast_config_destroy(cfg);
__unload_module();
return -1;
}
ast_destroy(cfg);
ast_config_destroy(cfg);
/* And start the monitor for the first time */
restart_monitor();
return 0;