kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-15 17:27:02 +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

12
res/res_indications.c
View File

@@ -230,7 +230,7 @@ static int ind_load_module(void)
/* that the following cast is needed, is yuk! */
/* yup, checked it out. It is NOT written to. */
cfg = ast_load((char *)config);
cfg = ast_config_load((char *)config);
if (!cfg)
return 0;
@@ -245,7 +245,7 @@ static int ind_load_module(void)
tones = malloc(sizeof(struct tone_zone));
if (!tones) {
ast_log(LOG_WARNING,"Out of memory\n");
ast_destroy(cfg);
ast_config_destroy(cfg);
return -1;
}
memset(tones,0,sizeof(struct tone_zone));
@@ -269,7 +269,7 @@ static int ind_load_module(void)
tmp = realloc(tones->ringcadance,(tones->nrringcadance+1)*sizeof(int));
if (!tmp) {
ast_log(LOG_WARNING, "Out of memory\n");
ast_destroy(cfg);
ast_config_destroy(cfg);
return -1;
}
tones->ringcadance = tmp;
@@ -286,7 +286,7 @@ static int ind_load_module(void)
struct tone_zone* azone = malloc(sizeof(struct tone_zone));
if (!azone) {
ast_log(LOG_WARNING,"Out of memory\n");
ast_destroy(cfg);
ast_config_destroy(cfg);
return -1;
}
memset(azone,0,sizeof(struct tone_zone));
@@ -313,7 +313,7 @@ static int ind_load_module(void)
ts = malloc(sizeof(struct tone_zone_sound));
if (!ts) {
ast_log(LOG_WARNING, "Out of memory\n");
ast_destroy(cfg);
ast_config_destroy(cfg);
return -1;
}
ts->next = NULL;
@@ -341,7 +341,7 @@ out: v = v->next;
if (!country || !*country || ast_set_indication_country(country))
ast_log(LOG_WARNING,"Unable to set the default country (for indication tones)\n");
ast_destroy(cfg);
ast_config_destroy(cfg);
return 0;
}