diff options
| author | Mark Spencer <markster@digium.com> | 2005-01-25 06:10:20 +0000 |
|---|---|---|
| committer | Mark Spencer <markster@digium.com> | 2005-01-25 06:10:20 +0000 |
| commit | 5f726ad8c72afd54c2909f25f2eab36e937321ab (patch) | |
| tree | 5e740f79246c281ef1bc43bcffc87fd21f676005 /channels/chan_modem.c | |
| parent | a611ce04f16e647cf072a380579cb3d64c538645 (diff) | |
Merge config updates (bug #3406)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4889 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_modem.c')
| -rwxr-xr-x | channels/chan_modem.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/channels/chan_modem.c b/channels/chan_modem.c index 4c4b6b80f..74f9ec7fc 100755 --- a/channels/chan_modem.c +++ b/channels/chan_modem.c @@ -949,7 +949,7 @@ int load_module() struct ast_variable *v; struct ast_modem_pvt *tmp; char driver[80]; - cfg = ast_load(config); + cfg = ast_config_load(config); /* We *must* have a config file otherwise stop immediately */ if (!cfg) { @@ -972,7 +972,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; @@ -984,7 +984,7 @@ int load_module() if (ast_load_resource(driver)) { ast_log(LOG_ERROR, "Failed to load driver %s\n", driver); - ast_destroy(cfg); + ast_config_destroy(cfg); ast_mutex_unlock(&iflock); __unload_module(); return -1; @@ -1055,11 +1055,11 @@ int load_module() if (ast_channel_register(type, tdesc, /* XXX Don't know our types -- maybe we should register more than one XXX */ AST_FORMAT_SLINEAR, modem_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; |