From c1b077c61c5bb6ccfe3722e3bb070002be72a747 Mon Sep 17 00:00:00 2001 From: Nate Bargmann Date: Thu, 25 Aug 2011 10:56:18 -0500 Subject: [PATCH] Remove set but unused variable errors in aor. --- aor/ar5000.c | 1 - aor/ar7030.c | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/aor/ar5000.c b/aor/ar5000.c index 7f32ea309..077b489d9 100644 --- a/aor/ar5000.c +++ b/aor/ar5000.c @@ -403,7 +403,6 @@ int format5k_mode(RIG *rig, char *buf, rmode_t mode, pbwidth_t width) case RIG_MODE_WFM: case RIG_MODE_FM: aormode = AR5K_FM; break; case RIG_MODE_LSB: aormode = AR5K_LSB; break; - case RIG_MODE_SSB: case RIG_MODE_USB: aormode = AR5K_USB; break; case RIG_MODE_CW: aormode = AR5K_CW; break; case RIG_MODE_SAM: aormode = AR5K_SAM; break; diff --git a/aor/ar7030.c b/aor/ar7030.c index 2f5ad560b..c98087082 100644 --- a/aor/ar7030.c +++ b/aor/ar7030.c @@ -83,7 +83,11 @@ static int rxr_readByte(RIG *rig) unsigned char buf[] = {0x71}; // Read command int retval; retval = write_block(&rig->state.rigport, (char *) buf, 1); + if (retval != RIG_OK) + return retval; retval = read_block(&rig->state.rigport, (char *) response, 1); + if (retval != RIG_OK) + return retval; return response[0]; } @@ -258,7 +262,11 @@ static int Execute_Routine_14(RIG *rig) unsigned char buf[] = {0x2e}; // Read command int retval; retval = write_block(&rig->state.rigport, (char *) buf, 1); + if (retval != RIG_OK) + return retval; retval = read_block(&rig->state.rigport, (char *) response, 1); + if (retval != RIG_OK) + return retval; return response[0]; }