Skip to content

Commit

Permalink
Fixed indentation warnings detected by newer gcc
Browse files Browse the repository at this point in the history 
Fixed one error discovered by these warnings in easycomm.c
  • Loading branch information
@mdblack98
mdblack98 committed Jun 28, 2017
1 parent cab7eb1 commit 0b1a58d
Show file tree
Hide file tree
Showing 18 changed files with 78 additions and 77 deletions.
8 changes: 4 additions & 4 deletions aor/aor.c
View file
Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions dummy/dummy.c
View file
Expand Up @@ -811,17 +811,17 @@ 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))
qrm = -30;
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];
Expand Down
3 changes: 2 additions & 1 deletion easycomm/easycomm.c
View file
Expand Up @@ -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) {
Expand Down
20 changes: 10 additions & 10 deletions kenwood/th.c
View file
Expand Up @@ -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) {
Expand Down Expand Up @@ -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;

Expand Down
12 changes: 6 additions & 6 deletions kenwood/thd72.c
View file
Expand Up @@ -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; i<BLOCK_COUNT; i++) {
Expand Down
9 changes: 5 additions & 4 deletions kenwood/ts570.c
View file
Expand Up @@ -370,16 +370,17 @@ ts570_get_level (RIG * rig, vfo_t vfo, setting_t level, value_t * val)
if (levelint == 0) {
val->i = 0;
} else {
for (i=0; i<levelint && i<MAXDBLSTSIZ; i++)
for (i=0; i<levelint && i<MAXDBLSTSIZ; i++) {
if (rig->state.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:
Expand Down
12 changes: 6 additions & 6 deletions kenwood/ts870s.c
View file
Expand Up @@ -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 */
}
Expand Down
6 changes: 3 additions & 3 deletions kit/rs_hfiq.c
View file
Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions pcr/pcr.c
View file
Expand Up @@ -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;
Expand Down
15 changes: 7 additions & 8 deletions prm80/prm80.c
View file
Expand Up @@ -115,16 +115,15 @@ static int prm80_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
for (i=0; i<retval; i++)
data[i] &= 0x7f;

*data_len = retval;
*data_len = retval;

/* chomp CR/LF from string
*/
/* chomp CR/LF from string */
if (*data_len >= 2 && data[*data_len-1] == '\x0a')
*data_len -= 2;

data[*data_len] = '\0';
data[*data_len] = '\0';

return RIG_OK;
return RIG_OK;
}


Expand Down Expand Up @@ -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;

Expand All @@ -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;
}

/*
Expand Down
10 changes: 5 additions & 5 deletions racal/ra37xx.c
View file
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions rs/rs.c
View file
Expand Up @@ -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;
}
Expand Down
12 changes: 6 additions & 6 deletions tentec/rx331.c
View file
Expand Up @@ -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:
Expand All @@ -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;
}


Expand Down
12 changes: 6 additions & 6 deletions tentec/rx340.c
View file
Expand Up @@ -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;
}

/*
Expand Down Expand Up @@ -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:
Expand All @@ -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;
}


Expand Down
4 changes: 2 additions & 2 deletions yaesu/ft1000d.c
View file
Expand Up @@ -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;
}


Expand Down
2 changes: 1 addition & 1 deletion yaesu/ft890.c
View file
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion yaesu/ft900.c
View file
Expand Up @@ -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;

Expand Down
8 changes: 4 additions & 4 deletions yaesu/newcat.c
View file
Expand Up @@ -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:
Expand Down

0 comments on commit 0b1a58d

Please sign in to comment.