kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 02:37:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

issue #5826

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-2@7190 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2005-11-23 05:49:35 +00:00
parent 5861d3fd64
commit 8c74501001
5 changed files with 44 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
res/res_indications.c
View File

@@ -182,11 +182,11 @@ static int handle_show_indications(int fd, int argc, char *argv[])
ast_cli(fd,"Country Indication PlayList\n"
"=====================================\n");
}
j = snprintf(buf,sizeof(buf),"%-7.7s %-15.15s ",tz->country,"<ringcadance>");
for (i=0; i<tz->nrringcadance; i++) {
j += snprintf(buf+j,sizeof(buf)-j,"%d,",tz->ringcadance[i]);
j = snprintf(buf,sizeof(buf),"%-7.7s %-15.15s ",tz->country,"<ringcadence>");
for (i=0; i<tz->nrringcadence; i++) {
j += snprintf(buf+j,sizeof(buf)-j,"%d,",tz->ringcadence[i]);
}
if (tz->nrringcadance) j--;
if (tz->nrringcadence) j--;
ast_copy_string(buf+j,"\n",sizeof(buf)-j);
ast_cli(fd,buf);
for (ts=tz->tones; ts; ts=ts->next)
@@ -271,26 +271,26 @@ static int ind_load_module(void)
while(v) {
if (!strcasecmp(v->name, "description")) {
ast_copy_string(tones->description, v->value, sizeof(tones->description));
} else if (!strcasecmp(v->name,"ringcadance")) {
} else if ((!strcasecmp(v->name,"ringcadence"))||(!strcasecmp(v->name,"ringcadance"))) {
char *ring,*rings = ast_strdupa(v->value);
c = rings;
ring = strsep(&c,",");
while (ring) {
int *tmp, val;
if (!isdigit(ring[0]) || (val=atoi(ring))==-1) {
ast_log(LOG_WARNING,"Invalid ringcadance given '%s' at line %d.\n",ring,v->lineno);
ast_log(LOG_WARNING,"Invalid ringcadence given '%s' at line %d.\n",ring,v->lineno);
ring = strsep(&c,",");
continue;
}
tmp = realloc(tones->ringcadance,(tones->nrringcadance+1)*sizeof(int));
tmp = realloc(tones->ringcadence,(tones->nrringcadence+1)*sizeof(int));
if (!tmp) {
ast_log(LOG_WARNING, "Out of memory\n");
ast_config_destroy(cfg);
return -1;
}
tones->ringcadance = tmp;
tmp[tones->nrringcadance] = val;
tones->nrringcadance++;
tones->ringcadence = tmp;
tmp[tones->nrringcadence] = val;
tones->nrringcadence++;
/* next item */
ring = strsep(&c,",");
}