diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h index 983ca48f4..979cb783f 100644 --- a/include/hamlib/rig.h +++ b/include/hamlib/rig.h @@ -24,6 +24,8 @@ #ifndef _RIG_H #define _RIG_H 1 +#define BUILTINFUNC 0 + #define TRACE rig_debug(RIG_DEBUG_TRACE,"%s(%d) trace\n", __FILE__, __LINE__) #define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__) @@ -2562,6 +2564,7 @@ struct rig_state { int use_cached_freq; /*state.depth, spaces(), rig->state.depth, __func__, elapsed_ms(&__begin, HAMLIB_ELAPSED_GET)); // use this instead of snprintf for automatic detection of buffer limit #define SNPRINTF(s,n,...) { snprintf(s,n,##__VA_ARGS__);if (strlen(s) > n-1) fprintf(stderr,"****** %s(%d): buffer overflow ******\n", __func__, __LINE__); } diff --git a/rigs/dummy/dummy.c b/rigs/dummy/dummy.c index 819587699..d4a430d5b 100644 --- a/rigs/dummy/dummy.c +++ b/rigs/dummy/dummy.c @@ -150,7 +150,6 @@ static const struct confparams dummy_cfg_params[] = static void init_chan(RIG *rig, vfo_t vfo, channel_t *chan) { - ENTERFUNC; chan->channel_num = 0; chan->vfo = vfo; strcpy(chan->channel_desc, rig_strvfo(vfo)); @@ -208,7 +207,6 @@ static void copy_chan(channel_t *dest, const channel_t *src) struct ext_list *saved_ext_levels; int i; - ENTERFUNC; /* TODO: ext_levels[] of different sizes */ for (i = 0; !RIG_IS_EXT_END(src->ext_levels[i]) && @@ -1776,7 +1774,6 @@ static int dummy_scan(RIG *rig, vfo_t vfo, scan_t scan, int ch) static void chan_vfo(channel_t *chan, vfo_t vfo) { - ENTERFUNC; chan->vfo = vfo; strcpy(chan->channel_desc, rig_strvfo(vfo)); } @@ -2648,7 +2645,6 @@ struct rig_caps dummy_no_vfo_caps = DECLARE_INITRIG_BACKEND(dummy) { - ENTERFUNC; rig_debug(RIG_DEBUG_VERBOSE, "%s: _init called\n", __func__); rig_register(&dummy_caps); @@ -2657,6 +2653,5 @@ DECLARE_INITRIG_BACKEND(dummy) rig_register(&trxmanager_caps); rig_register(&dummy_no_vfo_caps); // rig_register(&tci1x_caps); - - RETURNFUNC(RIG_OK); + return RIG_OK; } diff --git a/rigs/dummy/flrig.c b/rigs/dummy/flrig.c index d2844953c..c36192148 100644 --- a/rigs/dummy/flrig.c +++ b/rigs/dummy/flrig.c @@ -263,10 +263,10 @@ static int check_vfo(vfo_t vfo) break; // will default to A in which_vfo default: - RETURNFUNC(FALSE); + return(FALSE); } - RETURNFUNC(TRUE); + return(TRUE); } /*Rather than use some huge XML library we only need a few things @@ -697,8 +697,6 @@ static rmode_t modeMapGetHamlib(const char *modeFLRig) int i; char modeFLRigCheck[64]; - ENTERFUNC; - SNPRINTF(modeFLRigCheck, sizeof(modeFLRigCheck), "|%s|", modeFLRig); for (i = 0; modeMap[i].mode_hamlib != 0; ++i) @@ -709,13 +707,13 @@ static rmode_t modeMapGetHamlib(const char *modeFLRig) if (modeMap[i].mode_flrig && strcmp(modeMap[i].mode_flrig, modeFLRigCheck) == 0) { - RETURNFUNC(modeMap[i].mode_hamlib); + return(modeMap[i].mode_hamlib); } } rig_debug(RIG_DEBUG_TRACE, "%s: mode requested: %s, not in modeMap\n", __func__, modeFLRig); - RETURNFUNC(RIG_MODE_NONE); + return(RIG_MODE_NONE); } diff --git a/rigs/dummy/netrigctl.c b/rigs/dummy/netrigctl.c index b859b7680..c4b519bd6 100644 --- a/rigs/dummy/netrigctl.c +++ b/rigs/dummy/netrigctl.c @@ -208,7 +208,6 @@ int parse_array_int(const char *s, const char *delim, int *array, int array_len) char *dup = strdup(s); char *rest = dup; int n = 0; - ENTERFUNC; while ((p = strtok_r(rest, delim, &rest))) { @@ -233,7 +232,6 @@ int parse_array_double(const char *s, const char *delim, double *array, char *dup = strdup(s); char *rest = dup; int n = 0; - ENTERFUNC; while ((p = strtok_r(rest, delim, &rest))) { diff --git a/rigs/dummy/tci1x.c b/rigs/dummy/tci1x.c index 4f993fb61..36357011a 100644 --- a/rigs/dummy/tci1x.c +++ b/rigs/dummy/tci1x.c @@ -263,10 +263,10 @@ static int check_vfo(vfo_t vfo) break; // will default to A in which_vfo default: - RETURNFUNC(FALSE); + return(FALSE); } - RETURNFUNC(TRUE); + return(TRUE); } /* @@ -513,8 +513,6 @@ static rmode_t modeMapGetHamlib(const char *modeTCI) int i; char modeTCICheck[MAXBUFLEN+2]; - ENTERFUNC; - SNPRINTF(modeTCICheck, sizeof(modeTCICheck), "|%s|", modeTCI); for (i = 0; modeMap[i].mode_hamlib != 0; ++i) @@ -525,13 +523,13 @@ static rmode_t modeMapGetHamlib(const char *modeTCI) if (modeMap[i].mode_tci1x && strcmp(modeMap[i].mode_tci1x, modeTCICheck) == 0) { - RETURNFUNC(modeMap[i].mode_hamlib); + return(modeMap[i].mode_hamlib); } } rig_debug(RIG_DEBUG_TRACE, "%s: mode requested: %s, not in modeMap\n", __func__, modeTCI); - RETURNFUNC(RIG_MODE_NONE); + return(RIG_MODE_NONE); } diff --git a/rigs/icom/frame.c b/rigs/icom/frame.c index 8ee80d802..1ee6bcad5 100644 --- a/rigs/icom/frame.c +++ b/rigs/icom/frame.c @@ -52,7 +52,6 @@ int make_cmd_frame(unsigned char frame[], unsigned char re_id, unsigned char ctr { int i = 0; - ENTERFUNC; #if 0 frame[i++] = PAD; /* give old rigs a chance to flush their rx buffers */ #endif @@ -86,7 +85,7 @@ int make_cmd_frame(unsigned char frame[], unsigned char re_id, unsigned char ctr frame[i++] = FI; /* EOM code */ - RETURNFUNC(i); + return(i); } int icom_frame_fix_preamble(int frame_len, unsigned char *frame) @@ -104,7 +103,7 @@ int icom_frame_fix_preamble(int frame_len, unsigned char *frame) { rig_debug(RIG_DEBUG_WARN, "%s: invalid Icom CI-V frame, no preamble found\n", __func__); - RETURNFUNC(-RIG_EPROTO); + return(-RIG_EPROTO); } return frame_len; @@ -468,7 +467,6 @@ static int read_icom_frame_generic(hamlib_port_t *p, const unsigned char rxbuffe int retries = 10; unsigned char *rx_ptr = (unsigned char *) rxbuffer; - ENTERFUNC; // zeroize the buffer so we can still check contents after timeouts memset(rx_ptr, 0, rxbuffer_len); @@ -493,14 +491,14 @@ static int read_icom_frame_generic(hamlib_port_t *p, const unsigned char rxbuffe if (i < 0 && i != RIG_BUSBUSY) /* die on errors */ { - RETURNFUNC(i); + return(i); } if (i == 0) /* nothing read?*/ { if (--retries <= 0) /* Tried enough times? */ { - RETURNFUNC(read); + return(read); } } @@ -514,7 +512,7 @@ static int read_icom_frame_generic(hamlib_port_t *p, const unsigned char rxbuffe while ((read < rxbuffer_len) && (rxbuffer[read - 1] != FI) && (rxbuffer[read - 1] != COL)); - RETURNFUNC(read); + return(read); } int read_icom_frame(hamlib_port_t *p, const unsigned char rxbuffer[], diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c index a76541911..514608ee3 100644 --- a/rigs/icom/icom.c +++ b/rigs/icom/icom.c @@ -9304,12 +9304,12 @@ DECLARE_PROBERIG_BACKEND(icom) if (!port) { - RETURNFUNC(RIG_MODEL_NONE); + return(RIG_MODEL_NONE); } if (port->type.rig != RIG_PORT_SERIAL) { - RETURNFUNC(RIG_MODEL_NONE); + return(RIG_MODEL_NONE); } port->write_delay = port->post_write_delay = 0; @@ -9328,7 +9328,7 @@ DECLARE_PROBERIG_BACKEND(icom) if (retval != RIG_OK) { - RETURNFUNC(RIG_MODEL_NONE); + return(RIG_MODEL_NONE); } /* @@ -9367,7 +9367,7 @@ DECLARE_PROBERIG_BACKEND(icom) * is this a CI-V device? */ close(port->fd); - RETURNFUNC(RIG_MODEL_NONE); + return(RIG_MODEL_NONE); } else if (buf[4] == NAK) { @@ -9478,11 +9478,11 @@ DECLARE_PROBERIG_BACKEND(icom) */ if (model != RIG_MODEL_NONE) { - RETURNFUNC(model); + return(model); } } - RETURNFUNC(model); + return(model); } /* @@ -9580,5 +9580,5 @@ DECLARE_INITRIG_BACKEND(icom) rig_register(&x6100_caps); rig_register(&g90_caps); - RETURNFUNC(RIG_OK); + return(RIG_OK); } diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c index 3eafd4af3..5d2e55e9d 100644 --- a/rigs/kenwood/kenwood.c +++ b/rigs/kenwood/kenwood.c @@ -661,10 +661,10 @@ rmode_t kenwood2rmode(unsigned char mode, const rmode_t mode_table[]) if (mode >= KENWOOD_MODE_TABLE_MAX) { - RETURNFUNC(RIG_MODE_NONE); + return(RIG_MODE_NONE); } - RETURNFUNC(mode_table[mode]); + return(mode_table[mode]); } char rmode2kenwood(rmode_t mode, const rmode_t mode_table[]) @@ -681,12 +681,12 @@ char rmode2kenwood(rmode_t mode, const rmode_t mode_table[]) if (mode_table[i] == mode) { rig_debug(RIG_DEBUG_VERBOSE, "%s: returning %d\n", __func__, i); - RETURNFUNC(i); + return(i); } } } - RETURNFUNC(-1); + return(-1); } int kenwood_init(RIG *rig) @@ -5432,12 +5432,12 @@ DECLARE_PROBERIG_BACKEND(kenwood) if (!port) { - RETURNFUNC(RIG_MODEL_NONE); + return(RIG_MODEL_NONE); } if (port->type.rig != RIG_PORT_SERIAL) { - RETURNFUNC(RIG_MODEL_NONE); + return(RIG_MODEL_NONE); } port->write_delay = port->post_write_delay = 0; @@ -5458,7 +5458,7 @@ DECLARE_PROBERIG_BACKEND(kenwood) { port->write_delay = write_delay; port->retry = retry; - RETURNFUNC(RIG_MODEL_NONE); + return(RIG_MODEL_NONE); } retval = write_block(port, (unsigned char *) "ID;", 3); @@ -5475,7 +5475,7 @@ DECLARE_PROBERIG_BACKEND(kenwood) { port->write_delay = write_delay; port->retry = retry; - RETURNFUNC(RIG_MODEL_NONE); + return(RIG_MODEL_NONE); } /* @@ -5489,7 +5489,7 @@ DECLARE_PROBERIG_BACKEND(kenwood) 6, id_len, idbuf); port->write_delay = write_delay; port->retry = retry; - RETURNFUNC(RIG_MODEL_NONE); + return(RIG_MODEL_NONE); } @@ -5508,7 +5508,7 @@ DECLARE_PROBERIG_BACKEND(kenwood) port->write_delay = write_delay; port->retry = retry; - RETURNFUNC(kenwood_id_string_list[i].model); + return(kenwood_id_string_list[i].model); } } @@ -5525,7 +5525,7 @@ DECLARE_PROBERIG_BACKEND(kenwood) if (retval != RIG_OK) { - RETURNFUNC(RIG_MODEL_NONE); + return(RIG_MODEL_NONE); } retval = write_block(port, (unsigned char *) "K2;", 3); @@ -5534,7 +5534,7 @@ DECLARE_PROBERIG_BACKEND(kenwood) if (retval != RIG_OK) { - RETURNFUNC(RIG_MODEL_NONE); + return(RIG_MODEL_NONE); } /* @@ -5549,7 +5549,7 @@ DECLARE_PROBERIG_BACKEND(kenwood) (*cfunc)(port, RIG_MODEL_K2, data); } - RETURNFUNC(RIG_MODEL_K2); + return(RIG_MODEL_K2); } } @@ -5565,7 +5565,7 @@ DECLARE_PROBERIG_BACKEND(kenwood) (*cfunc)(port, kenwood_id_list[i].model, data); } - RETURNFUNC(kenwood_id_list[i].model); + return(kenwood_id_list[i].model); } } @@ -5579,7 +5579,7 @@ DECLARE_PROBERIG_BACKEND(kenwood) rig_debug(RIG_DEBUG_TRACE, "%s: post_write_delay=%d\n", __func__, port->post_write_delay); - RETURNFUNC(RIG_MODEL_NONE); + return(RIG_MODEL_NONE); } @@ -5645,5 +5645,5 @@ DECLARE_INITRIG_BACKEND(kenwood) rig_register(&malachite_caps); rig_register(&tx500_caps); - RETURNFUNC(RIG_OK); + return(RIG_OK); } diff --git a/rigs/prm80/prm80.c b/rigs/prm80/prm80.c index 6f8839607..45bd517f2 100644 --- a/rigs/prm80/prm80.c +++ b/rigs/prm80/prm80.c @@ -646,7 +646,7 @@ static int prm80_do_read_system_state(hamlib_port_t *rigport, char *statebuf) if (ret < 0) { - RETURNFUNC(ret); + return(ret); } // The response length is fixed @@ -666,7 +666,7 @@ static int prm80_do_read_system_state(hamlib_port_t *rigport, char *statebuf) { rig_debug(RIG_DEBUG_ERR, "%s: len=%d < %d, statebuf='%s'\n", __func__, ret, CMD_E_RSP_LEN, statebuf); - RETURNFUNC(-RIG_EPROTO); + return(-RIG_EPROTO); } p = strchr(statebuf, '>'); diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c index 488d148d7..e03cbaabc 100644 --- a/rigs/yaesu/newcat.c +++ b/rigs/yaesu/newcat.c @@ -439,7 +439,7 @@ static int newcat_band_index(freq_t freq) else if (freq >= MHz(0.5) && freq < MHz(1.705)) { band = 12; } // MW Medium Wave rig_debug(RIG_DEBUG_TRACE, "%s: freq=%g, band=%d\n", __func__, freq, band); - RETURNFUNC(band); + return(band); } /* @@ -10506,38 +10506,34 @@ rmode_t newcat_rmode(char mode) { int i; - ENTERFUNC; - for (i = 0; i < sizeof(newcat_mode_conv) / sizeof(newcat_mode_conv[0]); i++) { if (newcat_mode_conv[i].modechar == mode) { rig_debug(RIG_DEBUG_TRACE, "%s: %s for %c\n", __func__, rig_strrmode(newcat_mode_conv[i].mode), mode); - RETURNFUNC(newcat_mode_conv[i].mode); + return(newcat_mode_conv[i].mode); } } - RETURNFUNC(RIG_MODE_NONE); + return(RIG_MODE_NONE); } char newcat_modechar(rmode_t rmode) { int i; - ENTERFUNC; - for (i = 0; i < sizeof(newcat_mode_conv) / sizeof(newcat_mode_conv[0]); i++) { if (newcat_mode_conv[i].mode == rmode) { rig_debug(RIG_DEBUG_TRACE, "%s: return %c for %s\n", __func__, newcat_mode_conv[i].modechar, rig_strrmode(rmode)); - RETURNFUNC(newcat_mode_conv[i].modechar); + return(newcat_mode_conv[i].modechar); } } - RETURNFUNC('0'); + return('0'); } rmode_t newcat_rmode_width(RIG *rig, vfo_t vfo, char mode, pbwidth_t *width) diff --git a/simulators/simyaesu.c b/simulators/simyaesu.c index eb63df681..e68a223cf 100644 --- a/simulators/simyaesu.c +++ b/simulators/simyaesu.c @@ -33,6 +33,7 @@ typedef enum nc_rigid_e NC_RIGID_FTDX9000MP = 103, NC_RIGID_FTDX5000 = 362, NC_RIGID_FTDX3000 = 460, + NC_RIGID_FTDX3000DM = 462, NC_RIGID_FTDX101D = 681, NC_RIGID_FTDX101MP = 682 } nc_rigid_t; @@ -153,7 +154,7 @@ int main(int argc, char *argv[]) { printf("%s\n", buf); usleep(50 * 1000); - pbuf = "IF059014200000+000000700000;"; + pbuf = "IF00107041000+000000200000;"; n = write(fd, pbuf, strlen(pbuf)); printf("n=%d\n", n); @@ -163,7 +164,7 @@ int main(int argc, char *argv[]) { printf("%s\n", buf); usleep(50 * 1000); - int id = NC_RIGID_FTDX3000; + int id = NC_RIGID_FTDX3000DM; SNPRINTF(buf, sizeof(buf), "ID%03d;", id); n = write(fd, buf, strlen(buf)); printf("n=%d\n", n); diff --git a/src/cache.c b/src/cache.c index 36bdf7ac1..64a899194 100644 --- a/src/cache.c +++ b/src/cache.c @@ -106,7 +106,6 @@ int rig_set_cache_freq(RIG *rig, vfo_t vfo, freq_t freq) if (rig_need_debug(RIG_DEBUG_CACHE)) { - ENTERFUNC; rig_cache_show(rig, __func__, __LINE__); } @@ -198,16 +197,16 @@ int rig_set_cache_freq(RIG *rig, vfo_t vfo, freq_t freq) default: rig_debug(RIG_DEBUG_ERR, "%s: unknown vfo?, vfo=%s\n", __func__, rig_strvfo(vfo)); - RETURNFUNC(-RIG_EINVAL); + return(-RIG_EINVAL); } if (rig_need_debug(RIG_DEBUG_CACHE)) { rig_cache_show(rig, __func__, __LINE__); - RETURNFUNC(RIG_OK); + return(RIG_OK); } - RETURNFUNC(RIG_OK); + return(RIG_OK); } /** diff --git a/src/iofunc.c b/src/iofunc.c index 32f3b5540..1edba397d 100644 --- a/src/iofunc.c +++ b/src/iofunc.c @@ -164,7 +164,7 @@ static int create_sync_data_pipe(hamlib_port_t *p) rig_debug(RIG_DEBUG_ERR, "%s: synchronous data pipe open status=%d, err=%s\n", __func__, status, strerror(errno)); close_sync_data_pipe(p); - RETURNFUNC(-RIG_EINTERNAL); + return(-RIG_EINTERNAL); } p->fd_sync_read = sync_pipe_fds[0]; @@ -188,7 +188,7 @@ static int create_sync_data_pipe(hamlib_port_t *p) rig_debug(RIG_DEBUG_ERR, "%s: synchronous data error code pipe open status=%d, err=%s\n", __func__, status, strerror(errno)); close_sync_data_pipe(p); - RETURNFUNC(-RIG_EINTERNAL); + return(-RIG_EINTERNAL); } p->fd_sync_error_read = sync_pipe_fds[0]; @@ -196,7 +196,7 @@ static int create_sync_data_pipe(hamlib_port_t *p) rig_debug(RIG_DEBUG_VERBOSE, "%s: created data pipe for synchronous transactions\n", __func__); - RETURNFUNC(RIG_OK); + return(RIG_OK); } #endif @@ -211,8 +211,6 @@ int HAMLIB_API port_open(hamlib_port_t *p) int status; int want_state_delay = 0; - ENTERFUNC; - p->fd = -1; init_sync_data_pipe(p); @@ -221,7 +219,7 @@ int HAMLIB_API port_open(hamlib_port_t *p) status = create_sync_data_pipe(p); if (status < 0) { - RETURNFUNC(status); + return(status); } } @@ -235,7 +233,7 @@ int HAMLIB_API port_open(hamlib_port_t *p) rig_debug(RIG_DEBUG_ERR, "%s: serial_open(%s) status=%d, err=%s\n", __func__, p->pathname, status, strerror(errno)); close_sync_data_pipe(p); - RETURNFUNC(status); + return(status); } if (p->parm.serial.rts_state != RIG_SIGNAL_UNSET @@ -249,7 +247,7 @@ int HAMLIB_API port_open(hamlib_port_t *p) if (status != 0) { close_sync_data_pipe(p); - RETURNFUNC(status); + return(status); } if (p->parm.serial.dtr_state != RIG_SIGNAL_UNSET) @@ -263,7 +261,7 @@ int HAMLIB_API port_open(hamlib_port_t *p) { rig_debug(RIG_DEBUG_ERR, "%s: set_dtr status=%d\n", __func__, status); close_sync_data_pipe(p); - RETURNFUNC(status); + return(status); } /* @@ -283,7 +281,7 @@ int HAMLIB_API port_open(hamlib_port_t *p) if (status < 0) { close_sync_data_pipe(p); - RETURNFUNC(status); + return(status); } break; @@ -294,7 +292,7 @@ int HAMLIB_API port_open(hamlib_port_t *p) if (status < 0) { close_sync_data_pipe(p); - RETURNFUNC(status); + return(status); } break; @@ -305,7 +303,7 @@ int HAMLIB_API port_open(hamlib_port_t *p) if (status < 0) { close_sync_data_pipe(p); - RETURNFUNC(-RIG_EIO); + return(-RIG_EIO); } p->fd = status; @@ -319,7 +317,7 @@ int HAMLIB_API port_open(hamlib_port_t *p) if (status < 0) { close_sync_data_pipe(p); - RETURNFUNC(status); + return(status); } break; @@ -337,17 +335,17 @@ int HAMLIB_API port_open(hamlib_port_t *p) if (status < 0) { close_sync_data_pipe(p); - RETURNFUNC(status); + return(status); } break; default: close_sync_data_pipe(p); - RETURNFUNC(-RIG_EINVAL); + return(-RIG_EINVAL); } - RETURNFUNC(RIG_OK); + return(RIG_OK); } @@ -361,8 +359,6 @@ int HAMLIB_API port_close(hamlib_port_t *p, rig_port_t port_type) { int ret = RIG_OK; - ENTERFUNC; - if (p->fd != -1) { switch (port_type) @@ -397,7 +393,7 @@ int HAMLIB_API port_close(hamlib_port_t *p, rig_port_t port_type) close_sync_data_pipe(p); - RETURNFUNC(ret); + return(ret); } @@ -941,7 +937,7 @@ int HAMLIB_API write_block(hamlib_port_t *p, const unsigned char *txbuffer, size if (p->fd < 0) { rig_debug(RIG_DEBUG_ERR, "%s: port not open\n", __func__); - RETURNFUNC(-RIG_EIO); + return(-RIG_EIO); } #ifdef WANT_NON_ACTIVE_POST_WRITE_DELAY diff --git a/src/misc.c b/src/misc.c index 5eb7dab67..0ea1f58f6 100644 --- a/src/misc.c +++ b/src/misc.c @@ -2468,7 +2468,7 @@ long long HAMLIB_API rig_get_caps_int(rig_model_t rig_model, default: //rig_debug(RIG_DEBUG_ERR, "%s: Unknown rig_caps value=%lld\n", __func__, rig_caps); - RETURNFUNC(-RIG_EINVAL); + return(-RIG_EINVAL); } } @@ -2582,6 +2582,13 @@ char *date_strget(char *buf, int buflen, int localtime) return buf; } +const char *spaces() +{ + static char *s = " "; + return s; +} + + //! @endcond diff --git a/src/misc.h b/src/misc.h index cec0a6101..f755c56cf 100644 --- a/src/misc.h +++ b/src/misc.h @@ -38,6 +38,8 @@ __BEGIN_DECLS +// a function to return just a string of spaces for indenting rig debug lines +const char *spaces(); /* * Do a hex dump of the unsigned char array. */ @@ -154,14 +156,17 @@ extern HAMLIB_EXPORT(char *)date_strget(char *buf, int buflen, int localtime); #define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__) void errmsg(int err, char *s, const char *func, const char *file, int line); #define ERRMSG(err, s) errmsg(err, s, __func__, __FILENAME__, __LINE__) -#define ENTERFUNC rig_debug(RIG_DEBUG_VERBOSE, "%s(%d):%s entered\n", __FILENAME__, __LINE__, __func__) +#define ENTERFUNC { ++rig->state.depth; \ + rig_debug(RIG_DEBUG_VERBOSE, "%.*s%d:%s(%d):%s entered\n", rig->state.depth, spaces(), rig->state.depth, __FILENAME__, __LINE__, __func__); \ + } // we need to refer to rc just once as it // could be a function call -#define RETURNFUNC(rc) do { \ +#define RETURNFUNC(rc) {do { \ int rctmp = rc; \ - rig_debug(RIG_DEBUG_VERBOSE, "%s(%d):%s return(%ld) %s\n", __FILENAME__, __LINE__, __func__, (long int) (rctmp), rctmp<0?rigerror(rctmp):""); \ + rig_debug(RIG_DEBUG_VERBOSE, "%.*s%d:%s(%d):%s return(%ld) %s\n", rig->state.depth, spaces(), rig->state.depth, __FILENAME__, __LINE__, __func__, (long int) (rctmp), rctmp<0?rigerror(rctmp):""); \ + --rig->state.depth; \ return (rctmp); \ - } while(0) + } while(0);} #define CACHE_RESET {\ elapsed_ms(&rig->state.cache.time_freqMainA, HAMLIB_ELAPSED_INVALIDATE);\ diff --git a/src/network.c b/src/network.c index dd3149c1f..33212487a 100644 --- a/src/network.c +++ b/src/network.c @@ -208,18 +208,16 @@ int network_open(hamlib_port_t *rp, int default_port) struct sockaddr_in client; char hoststr[256], portstr[6] = ""; - ENTERFUNC; - #ifdef __MINGW32__ status = network_init(); - if (status != RIG_OK) { RETURNFUNC(status); } + if (status != RIG_OK) { return(status); } #endif if (!rp) { - RETURNFUNC(-RIG_EINVAL); + return(-RIG_EINVAL); } memset(&hints, 0, sizeof(hints)); @@ -245,7 +243,7 @@ int network_open(hamlib_port_t *rp, int default_port) { status = parse_hoststr(rp->pathname, sizeof(rp->pathname), hoststr, portstr); - if (status != RIG_OK) { RETURNFUNC(status); } + if (status != RIG_OK) { return(status); } rig_debug(RIG_DEBUG_TRACE, "%s: hoststr=%s, portstr=%s\n", __func__, hoststr, portstr); @@ -291,7 +289,7 @@ int network_open(hamlib_port_t *rp, int default_port) __func__, rp->pathname, gai_strerror(status)); - RETURNFUNC(-RIG_ECONF); + return(-RIG_ECONF); } saved_res = res; @@ -310,7 +308,7 @@ int network_open(hamlib_port_t *rp, int default_port) { handle_error(RIG_DEBUG_ERR, "socket"); freeaddrinfo(saved_res); - RETURNFUNC(-RIG_EIO); + return(-RIG_EIO); } if (connect(fd, res->ai_addr, res->ai_addrlen) == 0) @@ -338,7 +336,7 @@ int network_open(hamlib_port_t *rp, int default_port) "%s: failed to connect to %s\n", __func__, rp->pathname); - RETURNFUNC(-RIG_EIO); + return(-RIG_EIO); } rp->fd = fd; @@ -348,7 +346,7 @@ int network_open(hamlib_port_t *rp, int default_port) rig_debug(RIG_DEBUG_TRACE, "%s: client port=%d\n", __func__, client.sin_port); rp->client_port = client.sin_port; - RETURNFUNC(RIG_OK); + return(RIG_OK); } @@ -420,8 +418,6 @@ int network_close(hamlib_port_t *rp) { int ret = 0; - ENTERFUNC; - if (rp->fd > 0) { #ifdef __MINGW32__ @@ -443,7 +439,7 @@ int network_close(hamlib_port_t *rp) } #endif - RETURNFUNC(ret); + return(ret); } //! @endcond @@ -543,14 +539,12 @@ static int multicast_publisher_create_data_pipe(multicast_publisher_priv_data *m int data_pipe_fds[2]; int status; - ENTERFUNC; - status = pipe(data_pipe_fds); if (status != 0) { rig_debug(RIG_DEBUG_ERR, "%s: multicast publisher data pipe creation failed with status=%d, err=%s\n", __func__, status, strerror(errno)); - RETURNFUNC(-RIG_EINTERNAL); + return(-RIG_EINTERNAL); } int flags = fcntl(data_pipe_fds[0], F_GETFD); @@ -563,13 +557,11 @@ static int multicast_publisher_create_data_pipe(multicast_publisher_priv_data *m mcast_publisher_priv->args.data_read_fd = data_pipe_fds[0]; mcast_publisher_priv->args.data_write_fd = data_pipe_fds[1]; - RETURNFUNC(RIG_OK); + return(RIG_OK); } static void multicast_publisher_close_data_pipe(multicast_publisher_priv_data *mcast_publisher_priv) { - ENTERFUNC; - if (mcast_publisher_priv->args.data_read_fd != -1) { close(mcast_publisher_priv->args.data_read_fd); mcast_publisher_priv->args.data_read_fd = -1; @@ -590,17 +582,17 @@ static int multicast_publisher_write_data(multicast_publisher_args *mcast_publis { rig_debug(RIG_DEBUG_ERR, "%s: error writing to multicast publisher data pipe, result=%d, err=%s\n", __func__, (int)result, strerror(errno)); - RETURNFUNC(-RIG_EIO); + return(-RIG_EIO); } if (result != length) { rig_debug(RIG_DEBUG_ERR, "%s: could not write to multicast publisher data pipe, expected %ld bytes, wrote %ld bytes\n", __func__, (long) length, (long) result); - RETURNFUNC(-RIG_EIO); + return(-RIG_EIO); } - RETURNFUNC(RIG_OK); + return(RIG_OK); } static int multicast_publisher_read_data(multicast_publisher_args *mcast_publisher_args, size_t length, unsigned char *data) @@ -621,7 +613,7 @@ static int multicast_publisher_read_data(multicast_publisher_args *mcast_publish retval = select(fd + 1, &rfds, NULL, &efds, &timeout); if (retval == 0) { - RETURNFUNC(-RIG_ETIMEOUT); + return(-RIG_ETIMEOUT); } if (retval < 0) @@ -645,21 +637,21 @@ static int multicast_publisher_read_data(multicast_publisher_args *mcast_publish { if (errno == EAGAIN) { - RETURNFUNC(-RIG_ETIMEOUT); + return(-RIG_ETIMEOUT); } rig_debug(RIG_DEBUG_ERR, "%s: error reading multicast publisher data: %s\n", __func__, strerror(errno)); - RETURNFUNC(-RIG_EIO); + return(-RIG_EIO); } if (result != length) { rig_debug(RIG_DEBUG_ERR, "%s: could not read from multicast publisher data pipe, expected %ld bytes, read %ld bytes\n", __func__, (long) length, (long) result); - RETURNFUNC(-RIG_EIO); + return(-RIG_EIO); } - RETURNFUNC(RIG_OK); + return(RIG_OK); } #endif @@ -779,7 +771,7 @@ static int multicast_publisher_read_packet(multicast_publisher_args *mcast_publi result = multicast_publisher_read_data(mcast_publisher_args, sizeof(packet), (unsigned char *) &packet); if (result < 0) { - RETURNFUNC(result); + return(result); } switch (packet.type) @@ -792,14 +784,14 @@ static int multicast_publisher_read_packet(multicast_publisher_args *mcast_publi mcast_publisher_args, sizeof(struct rig_spectrum_line), (unsigned char *) spectrum_line); if (result < 0) { - RETURNFUNC(result); + return(result); } if (packet.data_length - sizeof(struct rig_spectrum_line) != spectrum_line->spectrum_data_length) { rig_debug(RIG_DEBUG_ERR, "%s: multicast publisher data error, expected %d bytes of spectrum data, got %d bytes\n", __func__, (int)spectrum_line->spectrum_data_length, (int)(packet.data_length - sizeof(struct rig_spectrum_line))); - RETURNFUNC(-RIG_EPROTO); + return(-RIG_EPROTO); } spectrum_line->spectrum_data = spectrum_data; @@ -807,17 +799,17 @@ static int multicast_publisher_read_packet(multicast_publisher_args *mcast_publi result = multicast_publisher_read_data(mcast_publisher_args, spectrum_line->spectrum_data_length, spectrum_data); if (result < 0) { - RETURNFUNC(result); + return(result); } break; default: rig_debug(RIG_DEBUG_ERR, "%s: unexpected multicast publisher data packet type: %d\n", __func__, packet.type); - RETURNFUNC(-RIG_EPROTO); + return(-RIG_EPROTO); } *type = packet.type; - RETURNFUNC(RIG_OK); + return(RIG_OK); } void *multicast_publisher(void *arg) diff --git a/src/rig.c b/src/rig.c index f0a5dae60..dd0e7ba1e 100644 --- a/src/rig.c +++ b/src/rig.c @@ -261,13 +261,13 @@ static int remove_opened_rig(RIG *rig) } free(p); - RETURNFUNC(RIG_OK); + return(RIG_OK); } q = p; } - RETURNFUNC(-RIG_EINVAL); /* Not found in list ! */ + return(-RIG_EINVAL); /* Not found in list ! */ } @@ -297,11 +297,11 @@ int foreach_opened_rig(int (*cfunc)(RIG *, rig_ptr_t), rig_ptr_t data) { if ((*cfunc)(p->rig, data) == 0) { - RETURNFUNC(RIG_OK); + return(RIG_OK); } } - RETURNFUNC(RIG_OK); + return(RIG_OK); } #endif /* !DOC_HIDDEN */ @@ -373,7 +373,7 @@ static int rig_check_rig_caps() &caps_test.macro_name); } - RETURNFUNC(rc); + return(rc); } /** @@ -1488,7 +1488,12 @@ static int twiddling(RIG *rig) * * \sa rig_get_freq() */ +#if BUILTINFUNC +#undef rig_set_freq +int HAMLIB_API rig_set_freq(RIG *rig, vfo_t vfo, freq_t freq, const char *func) +#else int HAMLIB_API rig_set_freq(RIG *rig, vfo_t vfo, freq_t freq) +#endif { const struct rig_caps *caps; int retcode; @@ -1496,8 +1501,13 @@ int HAMLIB_API rig_set_freq(RIG *rig, vfo_t vfo, freq_t freq) vfo_t vfo_save; ELAPSED1; +#if BUILTINFUNC + rig_debug(RIG_DEBUG_VERBOSE, "%s called vfo=%s, freq=%.0f, called from %s\n", __func__, + rig_strvfo(vfo), freq, func); +#else rig_debug(RIG_DEBUG_VERBOSE, "%s called vfo=%s, freq=%.0f\n", __func__, rig_strvfo(vfo), freq); +#endif if (CHECK_RIG_ARG(rig)) { @@ -1716,7 +1726,7 @@ int HAMLIB_API rig_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) if (CHECK_RIG_ARG(rig)) { - RETURNFUNC(-RIG_EINVAL); + return(-RIG_EINVAL); } ELAPSED1; @@ -1724,7 +1734,7 @@ int HAMLIB_API rig_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) if (!freq) { rig_debug(RIG_DEBUG_TRACE, "%s: freq ptr invalid\n", __func__); - RETURNFUNC(-RIG_EINVAL); + return(-RIG_EINVAL); } rig_debug(RIG_DEBUG_VERBOSE, "%s(%d) called vfo=%s\n", __func__, __LINE__, @@ -1755,7 +1765,7 @@ int HAMLIB_API rig_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) rig_get_cache(rig, vfo, freq, &cache_ms_freq, &mode, &cache_ms_mode, &width, &cache_ms_width); ELAPSED2; - RETURNFUNC(RIG_OK); + return(RIG_OK); } rig_cache_show(rig, __func__, __LINE__); @@ -1774,7 +1784,7 @@ int HAMLIB_API rig_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) if (retcode != RIG_OK) { - RETURNFUNC(retcode); + return(retcode); } if (ptt) @@ -1783,7 +1793,7 @@ int HAMLIB_API rig_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) "%s: split is on so returning VFOA last known freq\n", __func__); *freq = rig->state.cache.freqMainA; - RETURNFUNC(RIG_OK); + return(RIG_OK); } } @@ -1800,7 +1810,7 @@ int HAMLIB_API rig_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) rig_debug(RIG_DEBUG_TRACE, "%s: %s cache hit age=%dms, freq=%.0f\n", __func__, rig_strvfo(vfo), cache_ms_freq, *freq); ELAPSED2; - RETURNFUNC(RIG_OK); + return(RIG_OK); } else { @@ -1814,7 +1824,7 @@ int HAMLIB_API rig_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) if (caps->get_freq == NULL) { - RETURNFUNC(-RIG_ENAVAIL); + return(-RIG_ENAVAIL); } rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): vfo_opt=%d, model=%d\n", __func__, @@ -1857,7 +1867,7 @@ int HAMLIB_API rig_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) if (!caps->set_vfo) { - RETURNFUNC(-RIG_ENAVAIL); + return(-RIG_ENAVAIL); } TRACE; @@ -1865,7 +1875,7 @@ int HAMLIB_API rig_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) if (retcode != RIG_OK) { - RETURNFUNC(retcode); + return(retcode); } rig_cache_show(rig, __func__, __LINE__); @@ -1912,7 +1922,7 @@ int HAMLIB_API rig_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) rig_cache_show(rig, __func__, __LINE__); ELAPSED2; - RETURNFUNC(retcode); + return(retcode); } /** @@ -1935,7 +1945,7 @@ int HAMLIB_API rig_get_freqs(RIG *rig, freq_t *freqA, freq_t freqB) { // we will attempt to avoid vfo swapping in this routine - RETURNFUNC(-RIG_ENIMPL); + return(-RIG_ENIMPL); } @@ -2241,7 +2251,7 @@ pbwidth_t HAMLIB_API rig_passband_normal(RIG *rig, rmode_t mode) { if (rs->filters[i].modes & mode) { - rig_debug(RIG_DEBUG_VERBOSE, "%s: return filter#%d, width=%d\n", __func__, i, + rig_debug(RIG_DEBUG_VERBOSE, "%.*s%d:%s: return filter#%d, width=%d\n", rig->state.depth, spaces(), rig->state.depth, __func__, i, (int)rs->filters[i].width); RETURNFUNC(rs->filters[i].width); } @@ -5598,11 +5608,9 @@ extern int rig_probe_all_backends(hamlib_port_t *p, */ rig_model_t HAMLIB_API rig_probe(hamlib_port_t *port) { - ENTERFUNC; - if (!port) { - RETURNFUNC(RIG_MODEL_NONE); + return(RIG_MODEL_NONE); } return rig_probe_first(port); @@ -5630,11 +5638,9 @@ int HAMLIB_API rig_probe_all(hamlib_port_t *port, rig_probe_func_t cfunc, rig_ptr_t data) { - ENTERFUNC; - if (!port) { - RETURNFUNC(-RIG_EINVAL); + return(-RIG_EINVAL); } return rig_probe_all_backends(port, cfunc, data); diff --git a/src/serial.c b/src/serial.c index de4ead71e..3987002ef 100644 --- a/src/serial.c +++ b/src/serial.c @@ -141,11 +141,9 @@ int HAMLIB_API serial_open(hamlib_port_t *rp) int fd; /* File descriptor for the port */ int err; - ENTERFUNC; - if (!rp) { - RETURNFUNC(-RIG_EINVAL); + return(-RIG_EINVAL); } @@ -161,13 +159,13 @@ int HAMLIB_API serial_open(hamlib_port_t *rp) */ if (rp->parm.serial.parity != RIG_PARITY_NONE) { - RETURNFUNC(-RIG_EIO); + return(-RIG_EIO); } if ((rp->parm.serial.handshake != RIG_HANDSHAKE_HARDWARE) && (rp->parm.serial.handshake != RIG_HANDSHAKE_NONE)) { - RETURNFUNC(-RIG_EIO); + return(-RIG_EIO); } /* @@ -182,7 +180,7 @@ int HAMLIB_API serial_open(hamlib_port_t *rp) if (fd == -1) { - RETURNFUNC(-RIG_EIO); + return(-RIG_EIO); } rp->fd = fd; @@ -218,7 +216,7 @@ int HAMLIB_API serial_open(hamlib_port_t *rp) * from the transceiver will be returned to both applications. */ uh_radio_fd = fd; - RETURNFUNC(RIG_OK); + return(RIG_OK); } /* @@ -247,7 +245,7 @@ int HAMLIB_API serial_open(hamlib_port_t *rp) __func__, rp->pathname, strerror(errno)); - RETURNFUNC(-RIG_EIO); + return(-RIG_EIO); } rp->fd = fd; @@ -257,13 +255,13 @@ int HAMLIB_API serial_open(hamlib_port_t *rp) if (err != RIG_OK) { CLOSE(fd); - RETURNFUNC(err); + return(err); } serial_flush(rp); // ensure nothing is there when we open hl_usleep(50 * 1000); // give a little time for MicroKeyer to finish - RETURNFUNC(RIG_OK); + return(RIG_OK); } @@ -288,11 +286,9 @@ int HAMLIB_API serial_setup(hamlib_port_t *rp) #endif term_options_backup_t *term_backup = NULL; - ENTERFUNC; - if (!rp) { - RETURNFUNC(-RIG_EINVAL); + return(-RIG_EINVAL); } fd = rp->fd; @@ -383,7 +379,7 @@ int HAMLIB_API serial_setup(hamlib_port_t *rp) rp->parm.serial.rate); CLOSE(fd); - RETURNFUNC(-RIG_ECONF); + return(-RIG_ECONF); } /* TODO */ @@ -430,7 +426,7 @@ int HAMLIB_API serial_setup(hamlib_port_t *rp) rp->parm.serial.data_bits); CLOSE(fd); - RETURNFUNC(-RIG_ECONF); + return(-RIG_ECONF); break; } @@ -455,7 +451,7 @@ int HAMLIB_API serial_setup(hamlib_port_t *rp) rp->parm.serial.stop_bits); CLOSE(fd); - RETURNFUNC(-RIG_ECONF); + return(-RIG_ECONF); break; } @@ -501,7 +497,7 @@ int HAMLIB_API serial_setup(hamlib_port_t *rp) rp->parm.serial.parity); CLOSE(fd); - RETURNFUNC(-RIG_ECONF); + return(-RIG_ECONF); break; } @@ -537,7 +533,7 @@ int HAMLIB_API serial_setup(hamlib_port_t *rp) rp->parm.serial.handshake); CLOSE(fd); - RETURNFUNC(-RIG_ECONF); + return(-RIG_ECONF); break; } @@ -582,7 +578,7 @@ int HAMLIB_API serial_setup(hamlib_port_t *rp) strerror(errno)); CLOSE(fd); - RETURNFUNC(-RIG_ECONF); /* arg, so close! */ + return(-RIG_ECONF); /* arg, so close! */ } #elif defined(HAVE_TERMIO_H) @@ -597,7 +593,7 @@ int HAMLIB_API serial_setup(hamlib_port_t *rp) strerror(errno)); CLOSE(fd); - RETURNFUNC(-RIG_ECONF); /* arg, so close! */ + return(-RIG_ECONF); /* arg, so close! */ } #else @@ -613,7 +609,7 @@ int HAMLIB_API serial_setup(hamlib_port_t *rp) strerror(errno)); CLOSE(fd); - RETURNFUNC(-RIG_ECONF); /* arg, so close! */ + return(-RIG_ECONF); /* arg, so close! */ } #endif @@ -631,7 +627,7 @@ int HAMLIB_API serial_setup(hamlib_port_t *rp) term_backup->next = term_options_backup_head; term_options_backup_head = term_backup; - RETURNFUNC(RIG_OK); + return(RIG_OK); } @@ -645,8 +641,6 @@ int HAMLIB_API serial_flush(hamlib_port_t *p) int len; int timeout_save; unsigned char buf[4096]; - ENTERFUNC; - //RETURNFUNC(RIG_OK); if (p->fd == uh_ptt_fd || p->fd == uh_radio_fd || p->flushx) { @@ -672,7 +666,7 @@ int HAMLIB_API serial_flush(hamlib_port_t *p) rig_debug(RIG_DEBUG_TRACE, "read flushed %d bytes\n", nbytes); - RETURNFUNC(RIG_OK); + return(RIG_OK); } timeout_save = p->timeout; @@ -715,7 +709,7 @@ int HAMLIB_API serial_flush(hamlib_port_t *p) p->timeout = timeout_save; //rig_debug(RIG_DEBUG_VERBOSE, "tcflush%s\n", ""); //tcflush(p->fd, TCIFLUSH); - RETURNFUNC(RIG_OK); + return(RIG_OK); } @@ -776,7 +770,7 @@ int ser_open(hamlib_port_t *p) } p->fd = ret; - RETURNFUNC(ret); + return(ret); } @@ -803,7 +797,7 @@ int ser_close(hamlib_port_t *p) uh_close_ptt(); uh_ptt_fd = -1; p->fd = -1; - RETURNFUNC(0); + return(0); } if (p->fd == uh_radio_fd) @@ -811,7 +805,7 @@ int ser_close(hamlib_port_t *p) uh_close_radio(); uh_radio_fd = -1; p->fd = -1; - RETURNFUNC(0); + return(0); } // Find backup termios options to restore before closing @@ -885,7 +879,7 @@ int ser_close(hamlib_port_t *p) rc = CLOSE(p->fd); p->fd = -1; - RETURNFUNC(rc); + return(rc); } @@ -900,14 +894,12 @@ int HAMLIB_API ser_set_rts(hamlib_port_t *p, int state) unsigned int y = TIOCM_RTS; int rc; - ENTERFUNC; - rig_debug(RIG_DEBUG_VERBOSE, "%s: RTS=%d\n", __func__, state); // ignore this for microHam ports if (p->fd == uh_ptt_fd || p->fd == uh_radio_fd) { - RETURNFUNC(RIG_OK); + return(RIG_OK); } #if defined(TIOCMBIS) && defined(TIOCMBIC) @@ -937,10 +929,10 @@ int HAMLIB_API ser_set_rts(hamlib_port_t *p, int state) "%s: Cannot change RTS - %s\n", __func__, strerror(errno)); - RETURNFUNC(-RIG_EIO); + return(-RIG_EIO); } - RETURNFUNC(RIG_OK); + return(RIG_OK); } @@ -978,21 +970,19 @@ int HAMLIB_API ser_set_dtr(hamlib_port_t *p, int state) unsigned int y = TIOCM_DTR; int rc; - ENTERFUNC; - rig_debug(RIG_DEBUG_VERBOSE, "%s: DTR=%d\n", __func__, state); // silently ignore on microHam RADIO channel, // but (un)set ptt on microHam PTT channel. if (p->fd == uh_radio_fd) { - RETURNFUNC(RIG_OK); + return(RIG_OK); } if (p->fd == uh_ptt_fd) { uh_set_ptt(state); - RETURNFUNC(RIG_OK); + return(RIG_OK); } #if defined(TIOCMBIS) && defined(TIOCMBIC) @@ -1022,10 +1012,10 @@ int HAMLIB_API ser_set_dtr(hamlib_port_t *p, int state) "%s: Cannot change DTR - %s\n", __func__, strerror(errno)); - RETURNFUNC(-RIG_EIO); + return(-RIG_EIO); } - RETURNFUNC(RIG_OK); + return(RIG_OK); } diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c index c83ac2715..5420ed4b9 100644 --- a/tests/rigctl_parse.c +++ b/tests/rigctl_parse.c @@ -657,7 +657,6 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc, char arg3[MAXARGSZ + 1], *p3 = NULL; vfo_t vfo = RIG_VFO_CURR; - ENTERFUNC; rig_debug(RIG_DEBUG_TRACE, "%s: called, interactive=%d\n", __func__, interactive); @@ -680,7 +679,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc, { rig_debug(RIG_DEBUG_WARN, "%s: nothing to scan#1? retcode=%d\n", __func__, retcode); - RETURNFUNC(RIGCTL_PARSE_ERROR); + return(RIGCTL_PARSE_ERROR); } if (cmd != 0xa && cmd != 0xd) @@ -699,12 +698,12 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc, if (scanfc(fin, "%c", &cmd) < 1) { rig_debug(RIG_DEBUG_WARN, "%s: nothing to scan#2?\n", __func__); - RETURNFUNC(RIGCTL_PARSE_ERROR); + return(RIGCTL_PARSE_ERROR); } } else if (cmd == '+' && prompt) { - RETURNFUNC(RIG_OK); + return(RIG_OK); } if (cmd != '\\' @@ -722,7 +721,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc, if (scanfc(fin, "%c", &cmd) < 1) { rig_debug(RIG_DEBUG_WARN, "%s: nothing to scan#3?\n", __func__); - RETURNFUNC(RIGCTL_PARSE_ERROR); + return(RIGCTL_PARSE_ERROR); } } else if (cmd != '\\' @@ -735,7 +734,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc, && prompt) { - RETURNFUNC(RIG_OK); + return(RIG_OK); } /* command by name */ @@ -746,7 +745,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc, if (scanfc(fin, "%c", pcmd) < 1) { rig_debug(RIG_DEBUG_WARN, "%s: nothing to scan#4?\n", __func__); - RETURNFUNC(RIGCTL_PARSE_ERROR); + return(RIGCTL_PARSE_ERROR); } retcode = fscanf(fin, "%s", ++pcmd); @@ -773,7 +772,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc, fprintf_flush(fout, "\nRig command: "); } - RETURNFUNC(RIG_OK); + return(RIG_OK); } last_was_ret = 1; @@ -791,11 +790,11 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc, if (scanfc(fin, "%c", &cmd) < 1) { rig_debug(RIG_DEBUG_WARN, "%s: nothing to scan#6?\n", __func__); - RETURNFUNC(RIGCTL_PARSE_ERROR); + return(RIGCTL_PARSE_ERROR); } } - RETURNFUNC(RIG_OK); + return(RIG_OK); } my_rig->state.vfo_opt = *vfo_opt; @@ -807,14 +806,14 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc, if (interactive && !prompt) { fprintf(fout, "%s0\n", NETRIGCTL_RET); } fflush(fout); - RETURNFUNC(RIGCTL_PARSE_END); + return(RIGCTL_PARSE_END); } if (cmd == '?') { usage_rig(fout); fflush(fout); - RETURNFUNC(RIG_OK); + return(RIG_OK); } } else @@ -824,11 +823,11 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc, if (EOF == retcode) { - RETURNFUNC(RIGCTL_PARSE_END); + return(RIGCTL_PARSE_END); } else if (retcode < 0) { - RETURNFUNC(RIGCTL_PARSE_ERROR); + return(RIGCTL_PARSE_ERROR); } else if ('\0' == command[1]) { @@ -849,7 +848,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc, fprintf(stderr, "Command '%c' not found!\n", cmd); } - RETURNFUNC(RIG_OK); + return(RIG_OK); } if (!(cmd_entry->flags & ARG_NOVFO) && *vfo_opt) @@ -867,7 +866,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc, if (scanfc(fin, "%s", arg1) < 1) { rig_debug(RIG_DEBUG_WARN, "%s: nothing to scan#7?\n", __func__); - RETURNFUNC(RIGCTL_PARSE_ERROR); + return(RIGCTL_PARSE_ERROR); } vfo = rig_parse_vfo(arg1); @@ -883,7 +882,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc, } else if (retcode < 0) { - RETURNFUNC(RIGCTL_PARSE_ERROR); + return(RIGCTL_PARSE_ERROR); } vfo = rig_parse_vfo(arg1); @@ -907,7 +906,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc, if (fgets(arg1, MAXARGSZ, fin) == NULL) { - RETURNFUNC(RIGCTL_PARSE_ERROR); + return(RIGCTL_PARSE_ERROR); } if (arg1[0] == 0xa) @@ -921,7 +920,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc, if (fgets(arg1, MAXARGSZ, fin) == NULL) { - RETURNFUNC(RIGCTL_PARSE_ERROR); + return(RIGCTL_PARSE_ERROR); } } @@ -949,11 +948,11 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc, { fprintf(stderr, "Invalid arg for command '%s'\n", cmd_entry->name); - RETURNFUNC(RIGCTL_PARSE_END); + return(RIGCTL_PARSE_END); } else if (retcode < 0) { - RETURNFUNC(RIGCTL_PARSE_ERROR); + return(RIGCTL_PARSE_ERROR); } p1 = arg1; @@ -978,7 +977,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc, if (scanfc(fin, "%s", arg1) < 1) { rig_debug(RIG_DEBUG_WARN, "%s: nothing to scan#8?\n", __func__); - RETURNFUNC(RIGCTL_PARSE_ERROR); + return(RIGCTL_PARSE_ERROR); } p1 = arg1; @@ -991,11 +990,11 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc, { fprintf(stderr, "Invalid arg for command '%s'\n", cmd_entry->name); - RETURNFUNC(1); + return(1); } else if (retcode < 0) { - RETURNFUNC(RIGCTL_PARSE_ERROR); + return(RIGCTL_PARSE_ERROR); } p1 = arg1; @@ -1028,7 +1027,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc, if (scanfc(fin, "%s", arg2) < 1) { rig_debug(RIG_DEBUG_WARN, "%s: nothing to scan#9?\n", __func__); - RETURNFUNC(RIGCTL_PARSE_ERROR); + return(RIGCTL_PARSE_ERROR); } p2 = arg2; @@ -1043,11 +1042,11 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc, { fprintf(stderr, "Invalid arg for command '%s'\n", cmd_entry->name); - RETURNFUNC(RIGCTL_PARSE_END); + return(RIGCTL_PARSE_END); } else if (retcode < 0) { - RETURNFUNC(RIGCTL_PARSE_ERROR); + return(RIGCTL_PARSE_ERROR); } p2 = arg2; @@ -1077,7 +1076,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc, if (scanfc(fin, "%s", arg3) < 1) { rig_debug(RIG_DEBUG_WARN, "%s: nothing to scan#10?\n", __func__); - RETURNFUNC(RIGCTL_PARSE_ERROR); + return(RIGCTL_PARSE_ERROR); } p3 = arg3; @@ -1093,11 +1092,11 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc, fprintf(stderr, "Invalid arg for command '%s'\n", cmd_entry->name); - RETURNFUNC(RIGCTL_PARSE_END); + return(RIGCTL_PARSE_END); } else if (retcode < 0) { - RETURNFUNC(RIGCTL_PARSE_ERROR); + return(RIGCTL_PARSE_ERROR); } p3 = arg3; @@ -1124,13 +1123,13 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc, if (!input_line) { fprintf_flush(fout, "\n"); - RETURNFUNC(RIGCTL_PARSE_END); + return(RIGCTL_PARSE_END); } /* Q or q to quit */ if (!(strncasecmp(input_line, "q", 1))) { - RETURNFUNC(RIGCTL_PARSE_END); + return(RIGCTL_PARSE_END); } /* '?' for help */ @@ -1138,13 +1137,13 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc, { usage_rig(fout); fflush(fout); - RETURNFUNC(RIG_OK); + return(RIG_OK); } /* '#' for comment */ if (!(strncmp(input_line, "#", 1))) { - RETURNFUNC(RIG_OK); + return(RIG_OK); } /* Blank line entered */ @@ -1152,7 +1151,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc, { fprintf(fout, "? for help, q to quit.\n"); fflush(fout); - RETURNFUNC(RIG_OK); + return(RIG_OK); } rig_debug(RIG_DEBUG_TRACE, "%s: input_line: %s\n", __func__, input_line); @@ -1176,7 +1175,7 @@ readline_repeat: { /* Oops! Invoke GDB!! */ fprintf_flush(fout, "\n"); - RETURNFUNC(RIGCTL_PARSE_END); + return(RIGCTL_PARSE_END); } /* At this point parsed_input contains the typed text of the command @@ -1235,7 +1234,7 @@ readline_repeat: { fprintf(stderr, "Valid multiple character command names contain alphanumeric characters plus '_'\n"); - RETURNFUNC(RIG_OK); + return(RIG_OK); } } @@ -1244,13 +1243,13 @@ readline_repeat: /* Single '\' entered, prompt again */ else if ((*parsed_input[0] == '\\') && (strlen(parsed_input[0]) == 1)) { - RETURNFUNC(RIG_OK); + return(RIG_OK); } /* Multiple characters but no leading '\' */ else { fprintf(stderr, "Precede multiple character command names with '\\'\n"); - RETURNFUNC(RIG_OK); + return(RIG_OK); } cmd_entry = find_cmd_entry(cmd); @@ -1266,7 +1265,7 @@ readline_repeat: fprintf(stderr, "Command '%c' not found!\n", cmd); } - RETURNFUNC(RIG_OK); + return(RIG_OK); } /* If vfo_opt is enabled (-o|--vfo) check if already given @@ -1291,7 +1290,7 @@ readline_repeat: if (!input_line) { fprintf_flush(fout, "\n"); - RETURNFUNC(RIGCTL_PARSE_END); + return(RIGCTL_PARSE_END); } /* Blank line entered */ @@ -1299,7 +1298,7 @@ readline_repeat: { fprintf(fout, "? for help, q to quit.\n"); fflush(fout); - RETURNFUNC(RIG_OK); + return(RIG_OK); } /* Get the first token of input, the rest, if any, will be @@ -1314,7 +1313,7 @@ readline_repeat: else { fprintf_flush(fout, "\n"); - RETURNFUNC(RIGCTL_PARSE_END); + return(RIGCTL_PARSE_END); } } @@ -1393,7 +1392,7 @@ readline_repeat: { fprintf(fout, "? for help, q to quit.\n"); fflush(fout); - RETURNFUNC(RIG_OK); + return(RIG_OK); } if (input_line) @@ -1403,7 +1402,7 @@ readline_repeat: else { fprintf_flush(fout, "\n"); - RETURNFUNC(RIGCTL_PARSE_END); + return(RIGCTL_PARSE_END); } } @@ -1455,7 +1454,7 @@ readline_repeat: { fprintf(fout, "? for help, q to quit.\n"); fflush(fout); - RETURNFUNC(RIG_OK); + return(RIG_OK); } result = strtok(input_line, " "); @@ -1467,7 +1466,7 @@ readline_repeat: else { fprintf_flush(fout, "\n"); - RETURNFUNC(RIGCTL_PARSE_END); + return(RIGCTL_PARSE_END); } } @@ -1521,7 +1520,7 @@ readline_repeat: { fprintf(fout, "? for help, q to quit.\n"); fflush(fout); - RETURNFUNC(RIG_OK); + return(RIG_OK); } result = strtok(input_line, " "); @@ -1533,7 +1532,7 @@ readline_repeat: else { fprintf_flush(fout, "\n"); - RETURNFUNC(RIGCTL_PARSE_END); + return(RIGCTL_PARSE_END); } } @@ -1587,7 +1586,7 @@ readline_repeat: { fprintf(fout, "? for help, q to quit.\n"); fflush(fout); - RETURNFUNC(RIG_OK); + return(RIG_OK); } result = strtok(input_line, " "); @@ -1599,7 +1598,7 @@ readline_repeat: else { fprintf_flush(fout, "\n"); - RETURNFUNC(RIGCTL_PARSE_END); + return(RIGCTL_PARSE_END); } } @@ -1708,7 +1707,7 @@ readline_repeat: if (sync_cb) { sync_cb(0); } /* unlock if necessary */ - RETURNFUNC(retcode); + return(retcode); } if (retcode != RIG_OK) @@ -1764,7 +1763,7 @@ readline_repeat: if (sync_cb) { sync_cb(0); } /* unlock if necessary */ - RETURNFUNC(retcode); + return(retcode); } @@ -1937,8 +1936,6 @@ int set_conf(RIG *my_rig, char *conf_parms) { char *p, *n; - ENTERFUNC; - p = conf_parms; while (p && *p != '\0') @@ -1950,7 +1947,7 @@ int set_conf(RIG *my_rig, char *conf_parms) if (!q) { - RETURNFUNC(-RIG_EINVAL); + return(-RIG_EINVAL); } *q++ = '\0'; @@ -1965,13 +1962,13 @@ int set_conf(RIG *my_rig, char *conf_parms) if (ret != RIG_OK) { - RETURNFUNC(ret); + return(ret); } p = n; } - RETURNFUNC(RIG_OK); + return(RIG_OK); } @@ -4627,7 +4624,7 @@ static int hasbinary(char *s, int len) for (i = 0; i < len; ++i) { - if (!isascii(s[i])) { RETURNFUNC(1); } + if (!isascii(s[i])) { return(1); } } return 0; diff --git a/tests/rigctlcom.c b/tests/rigctlcom.c index 316c3704f..a9b4f46ac 100644 --- a/tests/rigctlcom.c +++ b/tests/rigctlcom.c @@ -890,7 +890,7 @@ static int handle_ts2000(void *arg) if (strcmp(arg, "SA;") == 0) { // should we silently fail with RIG_OK instead? TBD - RETURNFUNC(-RIG_ENIMPL); + return(-RIG_ENIMPL); } if (strlen(arg) > 3 && ((char *)arg)[2] == '1') @@ -903,7 +903,7 @@ static int handle_ts2000(void *arg) } else { - RETURNFUNC(-RIG_ENAVAIL); + return(-RIG_ENAVAIL); } } diff --git a/tests/rigctld.c b/tests/rigctld.c index 5339eb17a..64f7e7070 100644 --- a/tests/rigctld.c +++ b/tests/rigctld.c @@ -1080,8 +1080,6 @@ void *handle_socket(void *arg) int ext_resp = 0; char resp_sep = '\n'; - ENTERFUNC; - fsockin = get_fsockin(handle_data_arg); if (!fsockin)