From b093554f542ac8d4db7ef00df689a26adc7c57c9 Mon Sep 17 00:00:00 2001 From: Tzafrir Cohen Date: Wed, 2 Nov 2011 21:57:25 +0000 Subject: [PATCH] Fix GCC 4.6 "set but not used" warnings Signed-off-by: Tzafrir Cohen git-svn-id: http://svn.astersk.org/svn/dahdi/tools/trunk@10311 17933a7a-c749-41c5-a318-cba88f637d49 --- dahdi_cfg.c | 39 +++++++++++++-------------------------- dahdi_maint.c | 2 -- 2 files changed, 13 insertions(+), 28 deletions(-) diff --git a/dahdi_cfg.c b/dahdi_cfg.c index cb23ae9..3ce9ef6 100644 --- a/dahdi_cfg.c +++ b/dahdi_cfg.c @@ -294,11 +294,10 @@ static int parseargs(char *input, char *output[], int maxargs, char sep) int dspanconfig(char *keyword, char *args) { static char *realargs[10]; - int argc; int res; int chans; int timing; - argc = res = parseargs(args, realargs, 4, ','); + res = parseargs(args, realargs, 4, ','); if (res != 4) { error("Incorrect number of arguments to 'dynamic' (should be ,
,, )\n"); return -1; @@ -812,13 +811,12 @@ static int unimplemented(char *keyword, char *args) int ctcss(char *keyword, char *args) { static char *realargs[10]; - int argc; int res; int rxtone; int rxtag; int txtone; int isdcs = 0; - argc = res = parseargs(args, realargs, 3, ','); + res = parseargs(args, realargs, 3, ','); if (res != 3) { error("Incorrect number of arguments to 'ctcss' (should be ,,)\n"); return -1; @@ -865,10 +863,9 @@ int ctcss(char *keyword, char *args) int dcsrx(char *keyword, char *args) { static char *realargs[10]; - int argc; int res; int rxtone; - argc = res = parseargs(args, realargs, 1, ','); + res = parseargs(args, realargs, 1, ','); if (res != 1) { error("Incorrect number of arguments to 'dcsrx' (should be )\n"); return -1; @@ -888,11 +885,10 @@ int dcsrx(char *keyword, char *args) int tx(char *keyword, char *args) { static char *realargs[10]; - int argc; int res; int txtone; int isdcs = 0; - argc = res = parseargs(args, realargs, 1, ','); + res = parseargs(args, realargs, 1, ','); if (res != 1) { error("Incorrect number of arguments to 'tx' (should be )\n"); return -1; @@ -917,10 +913,9 @@ int tx(char *keyword, char *args) int debounce_time(char *keyword, char *args) { static char *realargs[10]; - int argc; int res; int val; - argc = res = parseargs(args, realargs, 1, ','); + res = parseargs(args, realargs, 1, ','); if (res != 1) { error("Incorrect number of arguments to 'debouncetime' (should be )\n"); return -1; @@ -940,10 +935,9 @@ int debounce_time(char *keyword, char *args) int burst_time(char *keyword, char *args) { static char *realargs[10]; - int argc; int res; int val; - argc = res = parseargs(args, realargs, 1, ','); + res = parseargs(args, realargs, 1, ','); if (res != 1) { error("Incorrect number of arguments to 'bursttime' (should be )\n"); return -1; @@ -963,10 +957,9 @@ int burst_time(char *keyword, char *args) int tx_gain(char *keyword, char *args) { static char *realargs[10]; - int argc; int res; int val; - argc = res = parseargs(args, realargs, 1, ','); + res = parseargs(args, realargs, 1, ','); if (res != 1) { error("Incorrect number of arguments to 'txgain' (should be )\n"); return -1; @@ -984,10 +977,9 @@ int tx_gain(char *keyword, char *args) int rx_gain(char *keyword, char *args) { static char *realargs[10]; - int argc; int res; int val; - argc = res = parseargs(args, realargs, 1, ','); + res = parseargs(args, realargs, 1, ','); if (res != 1) { error("Incorrect number of arguments to 'rxgain' (should be )\n"); return -1; @@ -1005,10 +997,9 @@ int rx_gain(char *keyword, char *args) int de_emp(char *keyword, char *args) { static char *realargs[10]; - int argc; int res; int val; - argc = res = parseargs(args, realargs, 1, ','); + res = parseargs(args, realargs, 1, ','); if (res != 1) { error("Incorrect number of arguments to 'de-emp' (should be )\n"); return -1; @@ -1028,10 +1019,9 @@ int de_emp(char *keyword, char *args) int pre_emp(char *keyword, char *args) { static char *realargs[10]; - int argc; int res; int val; - argc = res = parseargs(args, realargs, 1, ','); + res = parseargs(args, realargs, 1, ','); if (res != 1) { error("Incorrect number of arguments to 'pre_emp' (should be )\n"); return -1; @@ -1051,10 +1041,9 @@ int pre_emp(char *keyword, char *args) int invert_cor(char *keyword, char *args) { static char *realargs[10]; - int argc; int res; int val; - argc = res = parseargs(args, realargs, 1, ','); + res = parseargs(args, realargs, 1, ','); if (res != 1) { error("Incorrect number of arguments to 'invertcor' (should be )\n"); return -1; @@ -1078,10 +1067,9 @@ int invert_cor(char *keyword, char *args) int ext_tone(char *keyword, char *args) { static char *realargs[10]; - int argc; int res; int val; - argc = res = parseargs(args, realargs, 1, ','); + res = parseargs(args, realargs, 1, ','); if (res != 1) { error("Incorrect number of arguments to 'exttone' (should be )\n"); return -1; @@ -1107,11 +1095,10 @@ int ext_tone(char *keyword, char *args) int cor_thresh(char *keyword, char *args) { static char *realargs[10]; - int argc; int res; int val; int x = 0; - argc = res = parseargs(args, realargs, 1, ','); + res = parseargs(args, realargs, 1, ','); if (res != 1) { error("Incorrect number of arguments to 'corthresh' (should be )\n"); return -1; diff --git a/dahdi_maint.c b/dahdi_maint.c index 9ee4133..6777510 100644 --- a/dahdi_maint.c +++ b/dahdi_maint.c @@ -81,7 +81,6 @@ int main(int argc, char *argv[]) int doloopback = 0; char *larg = NULL; - int sflag = 0; int span = 1; int iflag = 0; char *iarg = NULL; @@ -118,7 +117,6 @@ int main(int argc, char *argv[]) break; case 's': /* specify a span */ span = atoi(optarg); - sflag = 1; break; case 'i': /* insert an error */ iarg = optarg;