From 0b1a58d308fd2f506dd4cb93f59a3df53250322b Mon Sep 17 00:00:00 2001 From: Michael Black W9MDB Date: Wed, 28 Jun 2017 18:00:20 +0100 Subject: [PATCH] Fixed indentation warnings detected by newer gcc Fixed one error discovered by these warnings in easycomm.c --- aor/aor.c | 8 ++++---- dummy/dummy.c | 8 ++++---- easycomm/easycomm.c | 3 ++- kenwood/th.c | 20 ++++++++++---------- kenwood/thd72.c | 12 ++++++------ kenwood/ts570.c | 9 +++++---- kenwood/ts870s.c | 12 ++++++------ kit/rs_hfiq.c | 6 +++--- pcr/pcr.c | 8 ++++---- prm80/prm80.c | 15 +++++++-------- racal/ra37xx.c | 10 +++++----- rs/rs.c | 4 ++-- tentec/rx331.c | 12 ++++++------ tentec/rx340.c | 12 ++++++------ yaesu/ft1000d.c | 4 ++-- yaesu/ft890.c | 2 +- yaesu/ft900.c | 2 +- yaesu/newcat.c | 8 ++++---- 18 files changed, 78 insertions(+), 77 deletions(-) diff --git a/aor/aor.c b/aor/aor.c index 54674fb02..09d41aea5 100644 --- a/aor/aor.c +++ b/aor/aor.c @@ -188,10 +188,10 @@ int aor_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) return retval; rfp = strstr(freqbuf, "RF"); - if (!rfp && rig->caps->rig_model == RIG_MODEL_AR8000) - rfp = strstr(freqbuf, "VA"); - if (!rfp && rig->caps->rig_model == RIG_MODEL_AR8000) - rfp = strstr(freqbuf, "VB"); + if (!rfp && rig->caps->rig_model == RIG_MODEL_AR8000) + rfp = strstr(freqbuf, "VA"); + if (!rfp && rig->caps->rig_model == RIG_MODEL_AR8000) + rfp = strstr(freqbuf, "VB"); if (!rfp) { rig_debug(RIG_DEBUG_WARN, "NO RF in returned string in aor_get_freq: '%s'\n", freqbuf); diff --git a/dummy/dummy.c b/dummy/dummy.c index c970c2a4c..902e9efe4 100644 --- a/dummy/dummy.c +++ b/dummy/dummy.c @@ -811,7 +811,7 @@ static int dummy_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) /* make S-Meter jiggle */ if (level == RIG_LEVEL_STRENGTH || level == RIG_LEVEL_RAWSTR) { - int qrm = -56; + int qrm = -56; if (curr->freq < MHz(7)) qrm = -20; else if (curr->freq < MHz(21)) @@ -819,9 +819,9 @@ static int dummy_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) else if (curr->freq < MHz(50)) qrm = -50; - curr->levels[idx].i = qrm + time(NULL)%32 + rand()%4 - - curr->levels[LVL_ATT].i - + curr->levels[LVL_PREAMP].i; + curr->levels[idx].i = qrm + time(NULL)%32 + rand()%4 + - curr->levels[LVL_ATT].i + + curr->levels[LVL_PREAMP].i; } *val = curr->levels[idx]; diff --git a/easycomm/easycomm.c b/easycomm/easycomm.c index 35dc0a84e..583e159f8 100644 --- a/easycomm/easycomm.c +++ b/easycomm/easycomm.c @@ -212,9 +212,10 @@ easycomm_rot_move_velocity(ROT *rot, int direction, int speed) char cmdstr[24], ackbuf[32]; int retval; rig_debug(RIG_DEBUG_TRACE, "%s called\n", __FUNCTION__); - if(speed<0 && speed>9999) + if(speed<0 && speed>9999) { rig_debug(RIG_DEBUG_ERR,"%s: Invalid speed value!(0-9999) (%d)\n", __FUNCTION__, speed); return -RIG_EINVAL; + } /* Speed for EasyComm 3 */ switch (direction) { diff --git a/kenwood/th.c b/kenwood/th.c index 7156e7891..42510c419 100644 --- a/kenwood/th.c +++ b/kenwood/th.c @@ -374,9 +374,9 @@ th_set_vfo(RIG *rig, vfo_t vfo) return retval; } - /* No "VMC" cmd on THD72A */ - if (rig->caps->rig_model == RIG_MODEL_THD72A) - return RIG_OK; + /* No "VMC" cmd on THD72A */ + if (rig->caps->rig_model == RIG_MODEL_THD72A) + return RIG_OK; /* set vfo */ switch (vfo) { @@ -980,14 +980,14 @@ th_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) if (retval != RIG_OK) return retval; - retval = sscanf(ackbuf, "AG %d,%x", &v, &l); - if (retval != 2 || l < rig->caps->level_gran[LVL_AF].min.i || l > rig->caps->level_gran[LVL_AF].max.i) { - rig_debug(RIG_DEBUG_ERR, "%s: Unexpected reply '%s'\n", __func__, ackbuf); - return -RIG_ERJCTED; - } + retval = sscanf(ackbuf, "AG %d,%x", &v, &l); + if (retval != 2 || l < rig->caps->level_gran[LVL_AF].min.i || l > rig->caps->level_gran[LVL_AF].max.i) { + rig_debug(RIG_DEBUG_ERR, "%s: Unexpected reply '%s'\n", __func__, ackbuf); + return -RIG_ERJCTED; + } - /* range [0.0 ... 1.0] */ - val->f = (float)(l-rig->caps->level_gran[LVL_AF].min.i) / + /* range [0.0 ... 1.0] */ + val->f = (float)(l-rig->caps->level_gran[LVL_AF].min.i) / (float)(rig->caps->level_gran[LVL_AF].max.i-rig->caps->level_gran[LVL_AF].min.i); break; diff --git a/kenwood/thd72.c b/kenwood/thd72.c index e8e3ff5d5..8d4333d5a 100644 --- a/kenwood/thd72.c +++ b/kenwood/thd72.c @@ -269,12 +269,12 @@ int thd72_get_chan_all_cb (RIG * rig, chan_cb_t chan_cb, rig_ptr_t arg) * has to provide a struct where to store data * future data for channel channel_num */ - chan = NULL; - ret = chan_cb(rig, &chan, chan_next, chan_list, arg); - if (ret != RIG_OK) - return ret; - if (chan == NULL) - return -RIG_ENOMEM; + chan = NULL; + ret = chan_cb(rig, &chan, chan_next, chan_list, arg); + if (ret != RIG_OK) + return ret; + if (chan == NULL) + return -RIG_ENOMEM; for (i=0; ii = 0; } else { - for (i=0; istate.preamp[i] == 0) { rig_debug(RIG_DEBUG_ERR,"%s: " "unexpected att level %d\n", __func__, levelint); return -RIG_EPROTO; } - if (i != levelint) - return -RIG_EINTERNAL; - val->i = rig->state.preamp[i-1]; + } + if (i != levelint) + return -RIG_EINTERNAL; + val->i = rig->state.preamp[i-1]; } break; default: diff --git a/kenwood/ts870s.c b/kenwood/ts870s.c index 8461b6e2b..baca3c773 100644 --- a/kenwood/ts870s.c +++ b/kenwood/ts870s.c @@ -144,14 +144,14 @@ static int ts870s_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) retval = kenwood_transaction (rig, "IS", buf, sizeof (buf)); if (retval != RIG_OK) - return retval; - buf_len = strlen (buf); + return retval; + buf_len = strlen (buf); if (buf_len != 7 || buf[1] != 'S') - { - rig_debug(RIG_DEBUG_ERR,"%s: unexpected IS answer, len=%d\n", + { + rig_debug(RIG_DEBUG_ERR,"%s: unexpected IS answer, len=%d\n", __func__,buf_len); - return -RIG_ERJCTED; - } + return -RIG_ERJCTED; + } *width = atoi (&buf[3]) - *width; /* bandwidth <- LPF - HPF */ } diff --git a/kit/rs_hfiq.c b/kit/rs_hfiq.c index 0bf8ec5fa..090962965 100644 --- a/kit/rs_hfiq.c +++ b/kit/rs_hfiq.c @@ -77,9 +77,9 @@ static int rshfiq_open(RIG *rig) retval = write_block(&rig->state.rigport, versionstr, strlen(versionstr)); if (retval != RIG_OK) return retval; - retval =read_string(&rig->state.rigport,versionstr,20,stopset,2); - if(retval <= 0 ) - return retval; + retval =read_string(&rig->state.rigport,versionstr,20,stopset,2); + if(retval <= 0 ) + return retval; } versionstr[retval]=0; rig_debug(RIG_DEBUG_TRACE, "%s: Rigversion = %s\n", __func__, versionstr); diff --git a/pcr/pcr.c b/pcr/pcr.c index 7e4e057e7..8123ac936 100644 --- a/pcr/pcr.c +++ b/pcr/pcr.c @@ -509,11 +509,11 @@ pcr_open(RIG * rig) * initial communication is at 9600bps for PCR 100/1000 * once the power is on, the serial speed can be changed with G1xx */ - if (rig->caps->rig_model == RIG_MODEL_PCR1500 || + if (rig->caps->rig_model == RIG_MODEL_PCR1500 || rig->caps->rig_model == RIG_MODEL_PCR2500) - startup_serial_rate = 38400; - else - startup_serial_rate = 9600; + startup_serial_rate = 38400; + else + startup_serial_rate = 9600; wanted_serial_rate = rs->rigport.parm.serial.rate; rs->rigport.parm.serial.rate = startup_serial_rate; diff --git a/prm80/prm80.c b/prm80/prm80.c index 34f8065bc..66b9c4e18 100644 --- a/prm80/prm80.c +++ b/prm80/prm80.c @@ -115,16 +115,15 @@ static int prm80_transaction(RIG *rig, const char *cmd, int cmd_len, char *data, for (i=0; i= 2 && data[*data_len-1] == '\x0a') *data_len -= 2; - data[*data_len] = '\0'; + data[*data_len] = '\0'; - return RIG_OK; + return RIG_OK; } @@ -372,7 +371,7 @@ int prm80_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) if (ret != RIG_OK) return ret; - switch (level) { + switch (level) { case RIG_LEVEL_AF: val->f = chan.levels[LVL_AF].f; @@ -386,9 +385,9 @@ int prm80_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) default: rig_debug(RIG_DEBUG_ERR,"Unsupported set_level %d\n", level); return -RIG_EINVAL; - } + } - return RIG_OK; + return RIG_OK; } /* diff --git a/racal/ra37xx.c b/racal/ra37xx.c index c6163ae01..693946408 100644 --- a/racal/ra37xx.c +++ b/racal/ra37xx.c @@ -621,12 +621,12 @@ int ra37xx_get_ant(RIG *rig, vfo_t vfo, ant_t *ant) if (ra_ant < 0 || ra_ant > 15) return -RIG_EPROTO; - *ant = ((ra_ant & (1<<0)) ? RIG_ANT_1 : 0) | - ((ra_ant & (1<<1)) ? RIG_ANT_2 : 0) | - ((ra_ant & (1<<2)) ? RIG_ANT_3 : 0) | - ((ra_ant & (1<<3)) ? RIG_ANT_4 : 0); + *ant = ((ra_ant & (1<<0)) ? RIG_ANT_1 : 0) | + ((ra_ant & (1<<1)) ? RIG_ANT_2 : 0) | + ((ra_ant & (1<<2)) ? RIG_ANT_3 : 0) | + ((ra_ant & (1<<3)) ? RIG_ANT_4 : 0); - return RIG_OK; + return RIG_OK; } int ra37xx_set_mem(RIG *rig, vfo_t vfo, int ch) diff --git a/rs/rs.c b/rs/rs.c index a6f0d0be5..4099fb6e9 100644 --- a/rs/rs.c +++ b/rs/rs.c @@ -301,8 +301,8 @@ const char * rs_get_info(RIG *rig) #define ID_QUERY BOM "*IDN?" EOM retval = rs_transaction(rig, ID_QUERY, strlen(ID_QUERY), infobuf, &info_len); - if (retval < 0) - return NULL; + if (retval < 0) + return NULL; return infobuf; } diff --git a/tentec/rx331.c b/tentec/rx331.c index b7ef74feb..2b9dfabd8 100644 --- a/tentec/rx331.c +++ b/tentec/rx331.c @@ -473,7 +473,7 @@ int rx331_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) if (buf_len < 4 || buf[0] != 'D' || buf[2] != 'I') return -RIG_EPROTO; - switch (buf[1]) { + switch (buf[1]) { case RX331_USB: *mode = RIG_MODE_USB; break; case RX331_LSB: *mode = RIG_MODE_LSB; break; case RX331_CW1: @@ -486,14 +486,14 @@ int rx331_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) rig_debug(RIG_DEBUG_ERR, "%s: unknown mode '%c'\n", __func__, buf[1]); return -RIG_EPROTO; - } + } - if (num_sscanf(buf+3, "%lf", &f) != 1) - return -RIG_EPROTO; + if (num_sscanf(buf+3, "%lf", &f) != 1) + return -RIG_EPROTO; - *width = f*1e3; + *width = f*1e3; - return RIG_OK; + return RIG_OK; } diff --git a/tentec/rx340.c b/tentec/rx340.c index 827e9c686..baa2a60d4 100644 --- a/tentec/rx340.c +++ b/tentec/rx340.c @@ -314,9 +314,9 @@ int rx340_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) if (buf_len < 2 || buf[0] != 'F' || num_sscanf(buf+1, "%lf", &f) != 1) return -RIG_EPROTO; - *freq = f*1e6; + *freq = f*1e6; - return RIG_OK; + return RIG_OK; } /* @@ -386,7 +386,7 @@ int rx340_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) if (buf_len < 4 || buf[0] != 'D' || buf[2] != 'I') return -RIG_EPROTO; - switch (buf[1]) { + switch (buf[1]) { case RX340_USB: *mode = RIG_MODE_USB; break; case RX340_LSB: *mode = RIG_MODE_LSB; break; case RX340_CW1: @@ -400,14 +400,14 @@ int rx340_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) "%s: unknown mode '%c'\n", __func__, buf[1]); return -RIG_EPROTO; - } + } if (num_sscanf(buf+3, "%lf", &f) != 1) return -RIG_EPROTO; - *width = f*1e3; + *width = f*1e3; - return RIG_OK; + return RIG_OK; } diff --git a/yaesu/ft1000d.c b/yaesu/ft1000d.c index 04f225b58..d9fe169cb 100644 --- a/yaesu/ft1000d.c +++ b/yaesu/ft1000d.c @@ -3133,12 +3133,12 @@ rig_debug(RIG_DEBUG_TRACE, "%s: ci = %0x%02x\n", __func__, ci); rig_debug(RIG_DEBUG_TRACE, "%s: set bw = 0x%02x\n",__func__, bw); - err = ft1000d_send_dynamic_cmd(rig, FT1000D_NATIVE_BANDWIDTH, bw, 0, 0, 0); + err = ft1000d_send_dynamic_cmd(rig, FT1000D_NATIVE_BANDWIDTH, bw, 0, 0, 0); if (err != RIG_OK) return err; - return RIG_OK; + return RIG_OK; } diff --git a/yaesu/ft890.c b/yaesu/ft890.c index ecbfc1820..1e810b7a3 100644 --- a/yaesu/ft890.c +++ b/yaesu/ft890.c @@ -1121,7 +1121,7 @@ static int ft890_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit) { if (err != RIG_OK) return err; - err = ft890_send_rit_freq(rig, FT890_NATIVE_CLARIFIER_OPS, rit); + err = ft890_send_rit_freq(rig, FT890_NATIVE_CLARIFIER_OPS, rit); if (err != RIG_OK) return err; diff --git a/yaesu/ft900.c b/yaesu/ft900.c index 0f2eb76fc..5328080df 100644 --- a/yaesu/ft900.c +++ b/yaesu/ft900.c @@ -1120,7 +1120,7 @@ static int ft900_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit) { if (err != RIG_OK) return err; - err = ft900_send_rit_freq(rig, FT900_NATIVE_CLARIFIER_OPS, rit); + err = ft900_send_rit_freq(rig, FT900_NATIVE_CLARIFIER_OPS, rit); if (err != RIG_OK) return err; diff --git a/yaesu/newcat.c b/yaesu/newcat.c index e7390ae76..32054f54a 100644 --- a/yaesu/newcat.c +++ b/yaesu/newcat.c @@ -2074,10 +2074,10 @@ int newcat_set_level(RIG * rig, vfo_t vfo, setting_t level, value_t val) case RIG_LEVEL_MICGAIN: if (!newcat_valid_command(rig, "MG")) return -RIG_ENAVAIL; - if (newcat_is_rig(rig, RIG_MODEL_FT1200)) - fpf = newcat_scale_float(100, val.f); - else - fpf = newcat_scale_float(255, val.f); + if (newcat_is_rig(rig, RIG_MODEL_FT1200)) + fpf = newcat_scale_float(100, val.f); + else + fpf = newcat_scale_float(255, val.f); snprintf(priv->cmd_str, sizeof(priv->cmd_str), "MG%03d%c", fpf, cat_term); break; case RIG_LEVEL_METER: