From 6c5e0e69748e0261b0b064870c41e1f54a99855c Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Wed, 16 Nov 2022 15:30:36 -0600 Subject: [PATCH] Update astyle formatting --- rigs/alinco/dx77.c | 2 +- rigs/dummy/dummy.c | 5 +++-- rigs/dummy/flrig.c | 21 +++++++++++++-------- rigs/icom/ic7610.c | 2 +- rigs/icom/ic785x.c | 2 +- rigs/icom/icom.c | 2 +- rigs/icom/icr6.c | 2 +- rigs/icom/icr8600.c | 2 +- rigs/kenwood/kenwood.c | 17 +++++++++++------ rigs/kenwood/ts950.c | 2 +- rigs/mds/mds.c | 9 +++++---- rigs/tentec/argonaut.c | 2 +- rigs/tentec/rx350.c | 2 +- rigs/yaesu/ft847.c | 4 ++-- rigs/yaesu/ft991.c | 2 +- rigs/yaesu/newcat.c | 11 +++++++---- simulators/simft818.c | 2 ++ simulators/simicom.c | 1 + simulators/simicom9700.c | 11 +++++++---- simulators/simkenwood.c | 2 +- simulators/simpowersdr.c | 3 ++- simulators/simyaesu.c | 1 + src/iofunc.c | 7 ++++--- src/rig.c | 7 +++++-- tests/rigctl.c | 3 ++- tests/rigctl_parse.c | 16 ++++++++++------ tests/rigctld.c | 3 ++- tests/rotctl_parse.c | 13 +++++++++---- 28 files changed, 97 insertions(+), 59 deletions(-) diff --git a/rigs/alinco/dx77.c b/rigs/alinco/dx77.c index 0445b046b..d66988d8d 100644 --- a/rigs/alinco/dx77.c +++ b/rigs/alinco/dx77.c @@ -210,7 +210,7 @@ const struct rig_caps dx77_caps = }, { .startf = kHz(500), .endf = MHz(30), .modes = DX77_AM_TX_MODES, - .low_power = -1, .high_power = -1 , RIG_VFO_A, RIG_ANT_NONE + .low_power = -1, .high_power = -1, RIG_VFO_A, RIG_ANT_NONE }, RIG_FRNG_END, }, diff --git a/rigs/dummy/dummy.c b/rigs/dummy/dummy.c index b1eb070bf..f9eec63e5 100644 --- a/rigs/dummy/dummy.c +++ b/rigs/dummy/dummy.c @@ -424,7 +424,8 @@ static int dummy_set_freq(RIG *rig, vfo_t vfo, freq_t freq) } if (vfo == RIG_VFO_CURR) { vfo = priv->curr_vfo; } - if (vfo == RIG_VFO_CURR || RIG_VFO_TX) { vfo = vfo_fixup(rig,vfo,rig->state.cache.split); } + + if (vfo == RIG_VFO_CURR || RIG_VFO_TX) { vfo = vfo_fixup(rig, vfo, rig->state.cache.split); } // if needed for testing enable this to emulate a rig with 100hz resolution #if 0 @@ -934,7 +935,7 @@ static int dummy_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq) int retval; ENTERFUNC; - + retval = dummy_set_freq(rig, vfo, tx_freq); priv->curr->tx_freq = tx_freq; rig_debug(RIG_DEBUG_VERBOSE, "%s: priv->curr->tx_freq = %.0f\n", __func__, diff --git a/rigs/dummy/flrig.c b/rigs/dummy/flrig.c index da64b0285..71a6b50d8 100644 --- a/rigs/dummy/flrig.c +++ b/rigs/dummy/flrig.c @@ -2362,20 +2362,25 @@ HAMLIB_EXPORT(int) flrig_cat_string(RIG *rig, const char *arg) return retval; } -HAMLIB_EXPORT(int) flrig_set_func(RIG *rig, vfo_t vfo, setting_t func, int status) +HAMLIB_EXPORT(int) flrig_set_func(RIG *rig, vfo_t vfo, setting_t func, + int status) { int retval; char cmd_arg[MAXARGLEN]; - rig_debug(RIG_DEBUG_VERBOSE, "%s called: level=%s, status=%d\n", __func__, rig_strfunc(func), status); - switch(func) + rig_debug(RIG_DEBUG_VERBOSE, "%s called: level=%s, status=%d\n", __func__, + rig_strfunc(func), status); + + switch (func) { - case RIG_FUNC_TUNER: - SNPRINTF(cmd_arg, sizeof(cmd_arg), - "%d", status); - retval = flrig_transaction(rig, "rig.tune", cmd_arg, NULL, 0); - default: + case RIG_FUNC_TUNER: + SNPRINTF(cmd_arg, sizeof(cmd_arg), + "%d", status); + retval = flrig_transaction(rig, "rig.tune", cmd_arg, NULL, 0); + + default: retval = -RIG_ENIMPL; } + return retval; } diff --git a/rigs/icom/ic7610.c b/rigs/icom/ic7610.c index 2079f60d1..c03227808 100644 --- a/rigs/icom/ic7610.c +++ b/rigs/icom/ic7610.c @@ -382,7 +382,7 @@ const struct rig_caps ic7610_caps = [LVL_SPECTRUM_SPEED] = {.min = {.i = 0}, .max = {.i = 2}, .step = {.i = 1}}, [LVL_SPECTRUM_REF] = {.min = {.f = -30.0f}, .max = {.f = 10.0f}, .step = {.f = 0.5f}}, [LVL_SPECTRUM_AVG] = {.min = {.i = 0}, .max = {.i = 3}, .step = {.i = 1}}, - [LVL_USB_AF] = {.min = {.f = 0.0f}, .max = {.f = 1.0f}, .step = {.f = 1.0f/255.0f }}, + [LVL_USB_AF] = {.min = {.f = 0.0f}, .max = {.f = 1.0f}, .step = {.f = 1.0f / 255.0f }}, }, .parm_gran = {}, .ext_tokens = ic7610_ext_tokens, diff --git a/rigs/icom/ic785x.c b/rigs/icom/ic785x.c index 7b9b4b614..0935b2b77 100644 --- a/rigs/icom/ic785x.c +++ b/rigs/icom/ic785x.c @@ -274,7 +274,7 @@ const struct rig_caps ic785x_caps = [LVL_SPECTRUM_SPEED] = {.min = {.i = 0}, .max = {.i = 2}, .step = {.i = 1}}, [LVL_SPECTRUM_REF] = {.min = {.f = -20.0f}, .max = {.f = 20.0f}, .step = {.f = 0.5f}}, [LVL_SPECTRUM_AVG] = {.min = {.i = 0}, .max = {.i = 3}, .step = {.i = 1}}, - [LVL_USB_AF] = {.min = {.f = 0.0f}, .max = {.f = 1.0f}, .step = {.f = 1.0f/255.0f }}, + [LVL_USB_AF] = {.min = {.f = 0.0f}, .max = {.f = 1.0f}, .step = {.f = 1.0f / 255.0f }}, }, .parm_gran = {}, .ext_tokens = ic785x_ext_tokens, diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c index 3bb8bf44d..1eb079a31 100644 --- a/rigs/icom/icom.c +++ b/rigs/icom/icom.c @@ -8076,7 +8076,7 @@ int icom_get_powerstat(RIG *rig, powerstat_t *status) rig->state.rigport.retry = 0; int retval = rig_get_freq(rig, RIG_VFO_A, &freq); rig->state.rigport.retry = retrysave; - *status = retval==RIG_OK ? RIG_POWER_ON : RIG_POWER_OFF; + *status = retval == RIG_OK ? RIG_POWER_ON : RIG_POWER_OFF; return retval; } else diff --git a/rigs/icom/icr6.c b/rigs/icom/icr6.c index 5e0dd4f4f..d14963e4c 100644 --- a/rigs/icom/icr6.c +++ b/rigs/icom/icr6.c @@ -119,7 +119,7 @@ const struct rig_caps icr6_caps = .tuning_steps = { {ICR6_MODES, Hz(5000)}, {ICR6_MODES, Hz(6250)}, - {ICR6_MODES, Hz(8330)}, // Air band only + {ICR6_MODES, Hz(8330)}, // Air band only {ICR6_MODES, Hz(9000)}, // AM broadcast band only {ICR6_MODES, Hz(10000)}, {ICR6_MODES, Hz(12500)}, diff --git a/rigs/icom/icr8600.c b/rigs/icom/icr8600.c index aaa607871..462aeac20 100644 --- a/rigs/icom/icr8600.c +++ b/rigs/icom/icr8600.c @@ -160,7 +160,7 @@ const struct rig_caps icr8600_caps = [LVL_SPECTRUM_SPEED] = {.min = {.i = 0}, .max = {.i = 2}, .step = {.i = 1}}, [LVL_SPECTRUM_REF] = {.min = {.f = -20.0f}, .max = {.f = 20.0f}, .step = {.f = 0.5f}}, [LVL_SPECTRUM_AVG] = {.min = {.i = 0}, .max = {.i = 3}, .step = {.i = 1}}, - [LVL_USB_AF] = {.min = {.f = 0.0f}, .max = {.f = 1.0f}, .step = {.f = 1.0f/255.0f }}, + [LVL_USB_AF] = {.min = {.f = 0.0f}, .max = {.f = 1.0f}, .step = {.f = 1.0f / 255.0f }}, }, .parm_gran = { [PARM_TIME] = { .min = { .i = 0 }, .max = { .i = 86399} } }, .ext_tokens = icr8600_tokens, diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c index b6964f5cb..400a3164f 100644 --- a/rigs/kenwood/kenwood.c +++ b/rigs/kenwood/kenwood.c @@ -245,7 +245,8 @@ int kenwood_transaction(RIG *rig, const char *cmdstr, char *data, struct kenwood_priv_caps *caps = kenwood_caps(rig); struct rig_state *rs; - rig_debug(RIG_DEBUG_VERBOSE, "%s called cmd=%s datasize=%d\n", __func__, cmdstr, (int)datasize); + rig_debug(RIG_DEBUG_VERBOSE, "%s called cmd=%s datasize=%d\n", __func__, cmdstr, + (int)datasize); if ((!cmdstr && !datasize) || (datasize && !data)) { @@ -373,8 +374,9 @@ transaction_read: KENWOOD_MAX_BUF_LEN); retval = read_string(&rs->rigport, (unsigned char *) buffer, len, cmdtrm_str, strlen(cmdtrm_str), 0, 1); - rig_debug(RIG_DEBUG_TRACE, "%s: read_string(expected=%d, len=%d)='%s'\n", __func__, - len,(int)strlen(buffer), buffer); + rig_debug(RIG_DEBUG_TRACE, "%s: read_string(expected=%d, len=%d)='%s'\n", + __func__, + len, (int)strlen(buffer), buffer); if (retval < 0) { @@ -637,7 +639,8 @@ int kenwood_safe_transaction(RIG *rig, const char *cmd, char *buf, int err; int retry = 0; - rig_debug(RIG_DEBUG_VERBOSE, "%s called, cmd=%s, expected=%d\n", __func__, cmd, (int)expected); + rig_debug(RIG_DEBUG_VERBOSE, "%s called, cmd=%s, expected=%d\n", __func__, cmd, + (int)expected); if (!cmd) { @@ -1844,12 +1847,14 @@ int kenwood_set_freq(RIG *rig, vfo_t vfo, freq_t freq) // cppcheck-suppress * SNPRINTF(freqbuf, sizeof(freqbuf), "F%c%011"PRIll, vfo_letter, (int64_t)freq); + // we need to modify priv->verify_cmd if ID is not being used // if FB command than we change to FB and back again to avoid VFO blinking - if (priv->verify_cmd[1]=='A' && vfo_letter == 'B') priv->verify_cmd[1]='A'; + if (priv->verify_cmd[1] == 'A' && vfo_letter == 'B') { priv->verify_cmd[1] = 'A'; } + err = kenwood_transaction(rig, freqbuf, NULL, 0); - if (priv->verify_cmd[1]=='B' && vfo_letter == 'B') priv->verify_cmd[1]='A'; + if (priv->verify_cmd[1] == 'B' && vfo_letter == 'B') { priv->verify_cmd[1] = 'A'; } if (RIG_OK == err && RIG_IS_TS590S && priv->fw_rev_uint <= 107 && ('A' == vfo_letter || 'B' == vfo_letter)) diff --git a/rigs/kenwood/ts950.c b/rigs/kenwood/ts950.c index 319df7424..d1007b40c 100644 --- a/rigs/kenwood/ts950.c +++ b/rigs/kenwood/ts950.c @@ -40,7 +40,7 @@ #define TS950_GET_LEVEL (RIG_LEVEL_RAWSTR) -// STR_CAL borrowed from TS850 +// STR_CAL borrowed from TS850 #define TS950_STR_CAL { 4, \ { \ { 0, -54 }, \ diff --git a/rigs/mds/mds.c b/rigs/mds/mds.c index 0e9cd93fd..e2a9e1ef6 100644 --- a/rigs/mds/mds.c +++ b/rigs/mds/mds.c @@ -613,15 +613,16 @@ const struct rig_caps mds_caps = // .vfo_ops = DUMMY_VFO_OP, .transceive = RIG_TRN_RIG, .rx_range_list1 = { - {.startf = MHz(380), .endf = MHz(530), .modes = RIG_MODE_ALL, + { + .startf = MHz(380), .endf = MHz(530), .modes = RIG_MODE_ALL, .low_power = 0, .high_power = 0, MDS_VFOS, RIG_ANT_1 }, RIG_FRNG_END, }, .rx_range_list2 = {RIG_FRNG_END,}, - .tx_range_list1 = { - {MHz(380), MHz(530), RIG_MODE_ALL, W(.1), W(5), RIG_VFO_A, RIG_ANT_NONE}, - RIG_FRNG_END, + .tx_range_list1 = { + {MHz(380), MHz(530), RIG_MODE_ALL, W(.1), W(5), RIG_VFO_A, RIG_ANT_NONE}, + RIG_FRNG_END, }, // .tx_range_list2 = {RIG_FRNG_END,} .tuning_steps = { diff --git a/rigs/tentec/argonaut.c b/rigs/tentec/argonaut.c index 01784e1f8..73df49e37 100644 --- a/rigs/tentec/argonaut.c +++ b/rigs/tentec/argonaut.c @@ -101,7 +101,7 @@ const struct rig_caps tt516_caps = .has_set_level = RIG_LEVEL_SET(TT516_LEVELS), .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE, - .level_gran = { + .level_gran = { [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } }, }, .parm_gran = {}, diff --git a/rigs/tentec/rx350.c b/rigs/tentec/rx350.c index 82b61b690..f59246a5c 100644 --- a/rigs/tentec/rx350.c +++ b/rigs/tentec/rx350.c @@ -108,7 +108,7 @@ const struct rig_caps rx350_caps = .has_set_parm = RX350_PARMS, .level_gran = { - [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } } + [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } } }, .parm_gran = {}, .ctcss_list = NULL, diff --git a/rigs/yaesu/ft847.c b/rigs/yaesu/ft847.c index d9d4a4e7e..329508920 100644 --- a/rigs/yaesu/ft847.c +++ b/rigs/yaesu/ft847.c @@ -626,8 +626,8 @@ const struct rig_caps ft650_caps = RIG_FRNG_END, }, /* tx range end */ - .tuning_steps = { - {RIG_MODE_ALL, 1}, + .tuning_steps = { + {RIG_MODE_ALL, 1}, RIG_TS_END, }, diff --git a/rigs/yaesu/ft991.c b/rigs/yaesu/ft991.c index bf1d7f474..d9a3dfcbf 100644 --- a/rigs/yaesu/ft991.c +++ b/rigs/yaesu/ft991.c @@ -166,7 +166,7 @@ const struct rig_caps ft991_caps = .has_set_parm = RIG_PARM_NONE, .level_gran = { #include "level_gran_yaesu.h" - [LVL_NR] = { .min = { .f = 0 }, .max = { .f = 1 }, .step = { .f = 1.0f/15.0f } }, + [LVL_NR] = { .min = { .f = 0 }, .max = { .f = 1 }, .step = { .f = 1.0f / 15.0f } }, }, .ctcss_list = common_ctcss_list, .dcs_list = common_dcs_list, diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c index be2e51c3b..5df3d4047 100644 --- a/rigs/yaesu/newcat.c +++ b/rigs/yaesu/newcat.c @@ -4190,13 +4190,16 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) if (is_ft991) { fpf = newcat_scale_float(15, val.f); - if (fpf > 15) fpf=15; - if (fpf < 1) fpf=1; + + if (fpf > 15) { fpf = 15; } + + if (fpf < 1) { fpf = 1; } } else { fpf = newcat_scale_float(15, val.f); - if (fpf > 15) fpf=10; + + if (fpf > 15) { fpf = 10; } } if (fpf < 0) @@ -11563,7 +11566,7 @@ int newcat_set_clock(RIG *rig, int year, int month, int day, int hour, int min, RETURNFUNC2(err); } - if (hour < 0) RETURNFUNC2(RIG_OK); + if (hour < 0) { RETURNFUNC2(RIG_OK); } SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "DT1%02d%02d%02d%c", hour, min, sec, cat_term); diff --git a/simulators/simft818.c b/simulators/simft818.c index f610801e3..43bccc582 100644 --- a/simulators/simft818.c +++ b/simulators/simft818.c @@ -110,10 +110,12 @@ int main(int argc, char *argv[]) while (1) { buf[0] = 0; + if (getmyline(fd, buf)) { printf("Cmd:%s\n", buf); } + //else { return 0; } if (strcmp(buf, "RM5;") == 0) diff --git a/simulators/simicom.c b/simulators/simicom.c index ebe7d895c..3fabffbf9 100644 --- a/simulators/simicom.c +++ b/simulators/simicom.c @@ -244,6 +244,7 @@ void frameParse(int fd, unsigned char *frame, int len) frame[6] = 0xfd; n = write(fd, frame, 7); break; + case 0x1a: // miscellaneous things switch (frame[5]) { diff --git a/simulators/simicom9700.c b/simulators/simicom9700.c index 9141e60b6..3af7015c5 100644 --- a/simulators/simicom9700.c +++ b/simulators/simicom9700.c @@ -56,6 +56,7 @@ frameGet(int fd, unsigned char *buf) unsigned char c; again: + while (read(fd, &c, 1) > 0) { buf[i++] = c; @@ -67,16 +68,18 @@ again: return i; } - if (i > 2 && c==0xfe) + if (i > 2 && c == 0xfe) { printf("Turning power on due to 0xfe string\n"); powerstat = 1; int j; - for(j=i;j<175;++j) + + for (j = i; j < 175; ++j) { - if (read(fd, &c, 1) < 0) break; + if (read(fd, &c, 1) < 0) { break; } } - i=0; + + i = 0; goto again; } } diff --git a/simulators/simkenwood.c b/simulators/simkenwood.c index 599595f6c..d602865dd 100644 --- a/simulators/simkenwood.c +++ b/simulators/simkenwood.c @@ -221,7 +221,7 @@ int main(int argc, char *argv[]) //usleep(mysleep * 1000); pbuf = "FW240"; n = write(fd, pbuf, strlen(pbuf)); - usleep(20*1000); + usleep(20 * 1000); pbuf = "0;"; n = write(fd, pbuf, strlen(pbuf)); continue; diff --git a/simulators/simpowersdr.c b/simulators/simpowersdr.c index bcab7159f..a059c80b7 100644 --- a/simulators/simpowersdr.c +++ b/simulators/simpowersdr.c @@ -322,7 +322,8 @@ int main(int argc, char *argv[]) } else if (strncmp(buf, "ZZMN", 4) == 0) { - SNPRINTF(buf, sizeof(buf), "ZZMN01 5.0k 5100 100 4.4k 4500 100 3.8k 3900 100 3.3k 3400 100 2.9k 3000 100 2.7k 2800 100 2.4k 2500 100 2.1k 2200 100 1.8k 1900 100 1.0k 1100 100Var 1 3150 100Var 2 2800 100;"); + SNPRINTF(buf, sizeof(buf), + "ZZMN01 5.0k 5100 100 4.4k 4500 100 3.8k 3900 100 3.3k 3400 100 2.9k 3000 100 2.7k 2800 100 2.4k 2500 100 2.1k 2200 100 1.8k 1900 100 1.0k 1100 100Var 1 3150 100Var 2 2800 100;"); n = write(fd, buf, strlen(buf)); printf("%s\n", buf); continue; diff --git a/simulators/simyaesu.c b/simulators/simyaesu.c index c5a313635..c7b7f7b3a 100644 --- a/simulators/simyaesu.c +++ b/simulators/simyaesu.c @@ -119,6 +119,7 @@ int main(int argc, char *argv[]) { printf("Cmd:%s\n", buf); } + //else { return 0; } if (buf[0] == 0x0a) diff --git a/src/iofunc.c b/src/iofunc.c index 0b8e6ae93..620178750 100644 --- a/src/iofunc.c +++ b/src/iofunc.c @@ -1262,7 +1262,8 @@ static int read_string_generic(hamlib_port_t *p, return -RIG_EINTERNAL; } - rig_debug(RIG_DEBUG_TRACE, "%s called, rxmax=%d direct=%d, expected_len=%d\n", __func__, + rig_debug(RIG_DEBUG_TRACE, "%s called, rxmax=%d direct=%d, expected_len=%d\n", + __func__, (int)rxmax, direct, expected_len); if (!p || !rxbuffer) @@ -1341,8 +1342,8 @@ static int read_string_generic(hamlib_port_t *p, { #if 0 #ifndef __MINGW32__ - // The ioctl works on Linux but not mingw - int avail=0; + // The ioctl works on Linux but not mingw + int avail = 0; ioctl(p->fd, FIONREAD, &avail); //rig_debug(RIG_DEBUG_ERR, "xs: avail=%d expected_len=%d, minlen=%d, direct=%d\n", __func__, avail, expected_len, minlen, direct); #endif diff --git a/src/rig.c b/src/rig.c index ee997c1ff..173867fb3 100644 --- a/src/rig.c +++ b/src/rig.c @@ -2253,9 +2253,12 @@ int HAMLIB_API rig_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) rmode_t mode_curr; pbwidth_t width_curr; retcode = caps->get_mode(rig, vfo, &mode_curr, &width_curr); - if (retcode == RIG_OK && mode==mode_curr) + + if (retcode == RIG_OK && mode == mode_curr) { - rig_debug(RIG_DEBUG_VERBOSE, "%s: mode already %s and bw change not requested\n", __func__, rig_strrmode(mode)); + rig_debug(RIG_DEBUG_VERBOSE, + "%s: mode already %s and bw change not requested\n", __func__, + rig_strrmode(mode)); ELAPSED2; RETURNFUNC2(RIG_OK); } diff --git a/tests/rigctl.c b/tests/rigctl.c index 8adc9c34e..f29defe9a 100644 --- a/tests/rigctl.c +++ b/tests/rigctl.c @@ -154,7 +154,8 @@ int main(int argc, char *argv[]) char vbuf[1024]; int err = setvbuf(stderr, vbuf, _IOFBF, sizeof(vbuf)); - if (err) rig_debug(RIG_DEBUG_ERR, "%s: setvbuf err=%s\n", __func__, strerror(err)); + + if (err) { rig_debug(RIG_DEBUG_ERR, "%s: setvbuf err=%s\n", __func__, strerror(err)); } while (1) { diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c index 08db0201e..8ddbf0e51 100644 --- a/tests/rigctl_parse.c +++ b/tests/rigctl_parse.c @@ -4891,7 +4891,8 @@ declare_proto_rig(send_cmd) ++rxbytes; // need length + 1 for end of string eom_buf[0] = 0; } - if (arg2[0] == ';') eom_buf[0] = ';'; + + if (arg2[0] == ';') { eom_buf[0] = ';'; } /* Assumes CR or LF is end of line char for all ASCII protocols. */ retval = read_string(&rs->rigport, buf, rxbytes, eom_buf, @@ -5174,8 +5175,8 @@ declare_proto_rig(get_cache) declare_proto_rig(set_clock) { int year, mon, day, hour = -1, min = -1, sec = 0; - double msec=-1; - int utc_offset = 0; + double msec = -1; + int utc_offset = 0; int n; char timebuf[64]; @@ -5198,17 +5199,20 @@ declare_proto_rig(set_clock) &min, &sec, &msec, &utc_offset); } else if (arg1[16] == '+' || arg1[16] == '-') - { // YYYY-MM-DDTHH:MM+ZZ + { + // YYYY-MM-DDTHH:MM+ZZ n = sscanf(arg1, "%04d-%02d-%02dT%02d:%02d%d", &year, &mon, &day, &hour, &min, &utc_offset); } else if (arg1[19] == '+' || arg1[19] == '-') - { // YYYY-MM-DDTHH:MM:SS+ZZ + { + // YYYY-MM-DDTHH:MM:SS+ZZ n = sscanf(arg1, "%04d-%02d-%02dT%02d:%02d:%02d%d", &year, &mon, &day, &hour, &min, &sec, &utc_offset); } else if (arg1[23] == '+' || arg1[23] == '-') - { // YYYY-MM-DDTHH:MM:SS.SSS+ZZ + { + // YYYY-MM-DDTHH:MM:SS.SSS+ZZ n = sscanf(arg1, "%04d-%02d-%02dT%02d:%02d:%02d%lf%d", &year, &mon, &day, &hour, &min, &sec, &msec, &utc_offset); } diff --git a/tests/rigctld.c b/tests/rigctld.c index 6a082fd8d..470534c32 100644 --- a/tests/rigctld.c +++ b/tests/rigctld.c @@ -284,7 +284,8 @@ int main(int argc, char *argv[]) is_rigctld = 1; int err = setvbuf(stderr, vbuf, _IOFBF, sizeof(vbuf)); - if (err) rig_debug(RIG_DEBUG_ERR, "%s: setvbuf err=%s\n", __func__, strerror(err)); + + if (err) { rig_debug(RIG_DEBUG_ERR, "%s: setvbuf err=%s\n", __func__, strerror(err)); } while (1) diff --git a/tests/rotctl_parse.c b/tests/rotctl_parse.c index c64a9e095..3c5c80dbb 100644 --- a/tests/rotctl_parse.c +++ b/tests/rotctl_parse.c @@ -2381,6 +2381,7 @@ declare_proto_rot(dump_state) fprintf(fout, "%d%c", rot->caps->rot_model, resp_sep); tag = "min_az="; + if ((interactive && prompt) || (interactive && !prompt && ext_resp)) { tag = "Minimum Azimuth: "; @@ -2389,33 +2390,37 @@ declare_proto_rot(dump_state) fprintf(fout, "%s%lf%c", tag, rs->min_az + rot->state.az_offset, resp_sep); tag = "max_az="; + if ((interactive && prompt) || (interactive && !prompt && ext_resp)) { - tag= "Maximum Azimuth: "; + tag = "Maximum Azimuth: "; } fprintf(fout, "%s%lf%c", tag, rs->max_az + rot->state.az_offset, resp_sep); tag = "min_el="; + if ((interactive && prompt) || (interactive && !prompt && ext_resp)) { - tag= "Minimum Elevation: "; + tag = "Minimum Elevation: "; } fprintf(fout, "%s%lf%c", tag, rs->min_el + rot->state.el_offset, resp_sep); tag = "max_el="; + if ((interactive && prompt) || (interactive && !prompt && ext_resp)) { - tag= "Maximum Elevation: "; + tag = "Maximum Elevation: "; } fprintf(fout, "%s%lf%c", tag, rs->max_el + rot->state.el_offset, resp_sep); tag = "south_zero="; + if ((interactive && prompt) || (interactive && !prompt && ext_resp)) { - tag= "South Zero: "; + tag = "South Zero: "; } fprintf(fout, "%s%d%c", tag, rs->south_zero, resp_sep);