diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-01-25 06:10:20 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-01-25 06:10:20 +0000 |
| commit | 2207b9a515214bf72785eabf75bd587bd7df23e8 (patch) | |
| tree | 5e740f79246c281ef1bc43bcffc87fd21f676005 /res/res_features.c | |
| parent | c7f2030d7977ded782c6430a33e57bbbb69cd6df (diff) | |
Merge config updates (bug #3406)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4889 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/res_features.c')
| -rwxr-xr-x | res/res_features.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/res/res_features.c b/res/res_features.c index 6ce3e4550..3e4f6be30 100755 --- a/res/res_features.c +++ b/res/res_features.c @@ -1444,9 +1444,9 @@ static int load_config(void) transferdigittimeout = DEFAULT_TRANSFER_DIGIT_TIMEOUT; featuredigittimeout = DEFAULT_FEATURE_DIGIT_TIMEOUT; - cfg = ast_load("features.conf"); + cfg = ast_config_load("features.conf"); if (!cfg) { - cfg = ast_load("parking.conf"); + cfg = ast_config_load("parking.conf"); if (cfg) ast_log(LOG_NOTICE, "parking.conf is deprecated in favor of 'features.conf'. Please rename it.\n"); } @@ -1501,7 +1501,7 @@ static int load_config(void) ast_log(LOG_NOTICE, "Unknown feature '%s'\n", var->name); var = var->next; } - ast_destroy(cfg); + ast_config_destroy(cfg); } if (con) |