From affd985bf285f7441f6ebf126da864164a4025da Mon Sep 17 00:00:00 2001 From: twisted Date: Wed, 23 Nov 2005 05:03:42 +0000 Subject: issue #5826 git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7188 f38db490-d61c-443f-a65b-d21fe96a405b --- res/res_indications.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'res') diff --git a/res/res_indications.c b/res/res_indications.c index 8a5a9ef1f..65ac3a9ba 100755 --- a/res/res_indications.c +++ b/res/res_indications.c @@ -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,""); - for (i=0; inrringcadance; i++) { - j += snprintf(buf+j,sizeof(buf)-j,"%d,",tz->ringcadance[i]); + j = snprintf(buf,sizeof(buf),"%-7.7s %-15.15s ",tz->country,""); + for (i=0; inrringcadence; 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,","); } -- cgit v1.2.3