From: Paul Belanger Date: Wed, 22 Feb 2012 20:20:29 +0000 (+0000) Subject: Fix -Werror=unused-but-set-variable compiler error (gcc 4.6.2) X-Git-Tag: 1.8.11.0-rc1~15 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8dc1509465e8f1a80822fe95b0e183fa987014ac;p=thirdparty%2Fasterisk.git Fix -Werror=unused-but-set-variable compiler error (gcc 4.6.2) Review: https://reviewboard.asterisk.org/r/1763/ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@356290 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_rpt.c b/apps/app_rpt.c index 8f8ba3e89b..518ee3ed88 100644 --- a/apps/app_rpt.c +++ b/apps/app_rpt.c @@ -1380,10 +1380,8 @@ static int priority_jump(struct rpt *myrpt, struct ast_channel *chan) static int linkcount(struct rpt *myrpt) { struct rpt_link *l; - char *reverse_patch_state; - int numoflinks; + int numoflinks; - reverse_patch_state = "DOWN"; numoflinks = 0; l = myrpt->links.next; while(l && (l != &myrpt->links)){ @@ -1392,13 +1390,8 @@ static int linkcount(struct rpt *myrpt) "maximum number of links exceeds %d in rpt_do_stats()!",MAX_STAT_LINKS); break; } - //if (l->name[0] == '0'){ /* Skip '0' nodes */ - // reverse_patch_state = "UP"; - // l = l->next; - // continue; - //} numoflinks++; - + l = l->next; } ast_log(LOG_NOTICE, "numoflinks=%i\n",numoflinks); @@ -2928,7 +2921,7 @@ static int rpt_do_stats(int fd, int argc, const char * const *argv) static int rpt_do_lstats(int fd, int argc, const char * const *argv) { - int i,j; + int i; char *connstate; struct rpt *myrpt; struct rpt_link *l; @@ -2948,7 +2941,6 @@ static int rpt_do_lstats(int fd, int argc, const char * const *argv) myrpt = &rpt_vars[i]; rpt_mutex_lock(&myrpt->lock); /* LOCK */ /* Traverse the list of connected nodes */ - j = 0; l = myrpt->links.next; while(l && (l != &myrpt->links)){ if (l->name[0] == '0'){ /* Skip '0' nodes */ @@ -3953,7 +3945,7 @@ struct rpt *myrpt; struct rpt_link *l,*l1,linkbase; struct ast_channel *mychannel; int vmajor, vminor, m; -char *p,*ct,*ct_copy,*ident, *nodename,*cp; +char *p,*ct,*ct_copy,*ident, *nodename; time_t t; #ifdef NEW_ASTERISK struct ast_tm localtm; @@ -4550,7 +4542,6 @@ struct dahdi_params par; res = ast_streamfile(mychannel, "rpt/invalid-freq", mychannel->language); break; case REMMODE: - cp = 0; wait_interval(myrpt, DLY_TELEM, mychannel); switch(myrpt->remmode) { @@ -5686,7 +5677,7 @@ static void send_newkey(struct ast_channel *chan) static int connect_link(struct rpt *myrpt, char* node, int mode, int perma) { - char *val, *s, *s1, *s2, *tele; + char *val, *s, *s1, *tele; char lstr[MAXLINKLIST],*strs[MAXLINKLIST]; char tmp[300], deststr[300] = "",modechange = 0; char sx[320],*sy; @@ -5721,7 +5712,6 @@ static int connect_link(struct rpt *myrpt, char* node, int mode, int perma) sprintf(sx,"%s:4569/%s",s1,sy + 1); s1 = sx; } - s2 = strsep(&s,","); rpt_mutex_lock(&myrpt->lock); l = myrpt->links.next; /* try to find this one in queue */ @@ -5881,7 +5871,7 @@ static int connect_link(struct rpt *myrpt, char* node, int mode, int perma) static int function_ilink(struct rpt *myrpt, char *param, char *digits, int command_source, struct rpt_link *mylink) { - char *val, *s, *s1, *s2; + char *val, *s, *s1; char tmp[300]; char digitbuf[MAXNODESTR],*strs[MAXLINKLIST]; char mode,perma; @@ -5922,7 +5912,6 @@ static int function_ilink(struct rpt *myrpt, char *param, char *digits, int comm sprintf(sx,"%s:4569/%s",s1,sy + 1); s1 = sx; } - s2 = strsep(&s,","); rpt_mutex_lock(&myrpt->lock); l = myrpt->links.next; /* try to find this one in queue */ @@ -6378,7 +6367,6 @@ static int function_playback(struct rpt *myrpt, char *param, char *digitbuf, int static int function_cop(struct rpt *myrpt, char *param, char *digitbuf, int command_source, struct rpt_link *mylink) { char string[16]; - int res; int i, r; @@ -6387,8 +6375,7 @@ static int function_cop(struct rpt *myrpt, char *param, char *digitbuf, int comm switch(myatoi(param)){ case 1: /* System reset */ - res = system("killall -9 asterisk"); - return DC_COMPLETE; + return system("killall -9 asterisk"); case 2: myrpt->p.s[myrpt->p.sysstate_cur].txdisable = 0; @@ -7812,7 +7799,7 @@ int band,txoffset = 0,txpower = 0,rxpl; static int setrtx(struct rpt *myrpt) { char tmp[MAXREMSTR] = "",*s,rigstr[200],pwr,res = 0; -int band,txoffset = 0,txpower = 0,rxpl,txpl; +int band,rxpl,txpl; float ofac; double txfreq; @@ -7875,31 +7862,6 @@ double txfreq; printf("@@@@ Bad TX PL: %s\n", myrpt->txpl); return -1; } - - switch(myrpt->offset) - { - case REM_MINUS: - txoffset = 0; - break; - case REM_PLUS: - txoffset = 0x10; - break; - case REM_SIMPLEX: - txoffset = 0x20; - break; - } - switch(myrpt->powerlevel) - { - case REM_LOWPWR: - txpower = 0; - break; - case REM_MEDPWR: - txpower = 0x20; - break; - case REM_HIPWR: - txpower = 0x10; - break; - } res = setrtx_check(myrpt); if (res < 0) return res; @@ -8371,11 +8333,10 @@ static int check_freq_ft897(int m, int d, int *defmode) static int set_freq_ft897(struct rpt *myrpt, char *newfreq) { unsigned char cmdstr[5]; - int fd,m,d; + int m,d; char mhz[MAXREMSTR]; char decimals[MAXREMSTR]; - fd = 0; if(debug) printf("New frequency: %s\n",newfreq); @@ -8903,9 +8864,8 @@ static int set_freq_ic706(struct rpt *myrpt, char *newfreq) { unsigned char cmdstr[20]; char mhz[MAXREMSTR], decimals[MAXREMSTR]; - int fd,m,d; + int m,d; - fd = 0; if(debug) ast_log(LOG_NOTICE,"newfreq:%s\n",newfreq); @@ -10343,7 +10303,7 @@ int res; static int attempt_reconnect(struct rpt *myrpt, struct rpt_link *l) { - char *val, *s, *s1, *s2, *tele; + char *val, *s, *s1, *tele; char tmp[300], deststr[300] = ""; char sx[320],*sy; @@ -10369,7 +10329,6 @@ static int attempt_reconnect(struct rpt *myrpt, struct rpt_link *l) sprintf(sx,"%s:4569/%s",s1,sy + 1); s1 = sx; } - s2 = strsep(&s,","); snprintf(deststr, sizeof(deststr), "IAX2/%s", s1); tele = strchr(deststr, '/'); if (!tele) { @@ -12009,12 +11968,11 @@ char tmpstr[300],lstr[MAXLINKLIST]; } if (myrpt->cmdAction.state == CMD_STATE_READY) { /* there is a command waiting to be processed */ - int status; myrpt->cmdAction.state = CMD_STATE_EXECUTING; // lose the lock rpt_mutex_unlock(&myrpt->lock); // do the function - status = (*function_table[myrpt->cmdAction.functionNumber].function)(myrpt,myrpt->cmdAction.param, myrpt->cmdAction.digits, myrpt->cmdAction.command_source, NULL); + (*function_table[myrpt->cmdAction.functionNumber].function)(myrpt,myrpt->cmdAction.param, myrpt->cmdAction.digits, myrpt->cmdAction.command_source, NULL); // get the lock again rpt_mutex_lock(&myrpt->lock); myrpt->cmdAction.state = CMD_STATE_IDLE;