From c7c5cd81bc92c8bf4af7134e89e7d259b081aad3 Mon Sep 17 00:00:00 2001 From: Michael Black W9MDB Date: Thu, 18 Mar 2021 07:09:58 -0500 Subject: [PATCH] In rig.c change RETURNFUNC calls with functions into separate lines https://github.com/Hamlib/Hamlib/issues/615 --- src/rig.c | 117 ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 82 insertions(+), 35 deletions(-) diff --git a/src/rig.c b/src/rig.c index b762d9e0d..b877d5b88 100644 --- a/src/rig.c +++ b/src/rig.c @@ -3099,7 +3099,8 @@ int HAMLIB_API rig_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd) if (vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo) { - RETURNFUNC(caps->get_dcd(rig, vfo, dcd)); + retcode = caps->get_dcd(rig, vfo, dcd); + RETURNFUNC(retcode); } if (!caps->set_vfo) @@ -3146,11 +3147,13 @@ int HAMLIB_API rig_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd) case RIG_DCD_PARALLEL: - RETURNFUNC(par_dcd_get(&rig->state.dcdport, dcd)); + retcode=par_dcd_get(&rig->state.dcdport, dcd); + RETURNFUNC(retcode); case RIG_DCD_GPIO: case RIG_DCD_GPION: - RETURNFUNC(gpio_dcd_get(&rig->state.dcdport, dcd)); + retcode = gpio_dcd_get(&rig->state.dcdport, dcd); + RETURNFUNC(retcode); case RIG_DCD_NONE: RETURNFUNC(-RIG_ENAVAIL); /* not available */ @@ -3200,7 +3203,8 @@ int HAMLIB_API rig_set_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t rptr_shift) if (vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo) { - RETURNFUNC(caps->set_rptr_shift(rig, vfo, rptr_shift)); + retcode = caps->set_rptr_shift(rig, vfo, rptr_shift); + RETURNFUNC(retcode); } if (!caps->set_vfo) @@ -3267,7 +3271,8 @@ int HAMLIB_API rig_get_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t *rptr_shift) if (vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo) { - RETURNFUNC(caps->get_rptr_shift(rig, vfo, rptr_shift)); + retcode = caps->get_rptr_shift(rig, vfo, rptr_shift); + RETURNFUNC(retcode); } if (!caps->set_vfo) @@ -3334,7 +3339,8 @@ int HAMLIB_API rig_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t rptr_offs) if (vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo) { - RETURNFUNC(caps->set_rptr_offs(rig, vfo, rptr_offs)); + retcode = caps->set_rptr_offs(rig, vfo, rptr_offs); + RETURNFUNC(retcode); } if (!caps->set_vfo) @@ -3401,7 +3407,8 @@ int HAMLIB_API rig_get_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t *rptr_offs) if (vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo) { - RETURNFUNC(caps->get_rptr_offs(rig, vfo, rptr_offs)); + retcode = caps->get_rptr_offs(rig, vfo, rptr_offs); + RETURNFUNC(retcode); } if (!caps->set_vfo) @@ -3466,7 +3473,8 @@ int HAMLIB_API rig_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq) || vfo == RIG_VFO_TX || vfo == rig->state.current_vfo)) { - RETURNFUNC(caps->set_split_freq(rig, vfo, tx_freq)); + retcode = caps->set_split_freq(rig, vfo, tx_freq); + RETURNFUNC(retcode); } vfo = vfo_fixup(rig, vfo); @@ -3595,7 +3603,8 @@ int HAMLIB_API rig_get_split_freq(RIG *rig, vfo_t vfo, freq_t *tx_freq) || vfo == RIG_VFO_TX || vfo == rig->state.current_vfo)) { - RETURNFUNC(caps->get_split_freq(rig, vfo, tx_freq)); + retcode = caps->get_split_freq(rig, vfo, tx_freq); + RETURNFUNC(retcode); } /* Assisted mode */ @@ -3613,7 +3622,8 @@ int HAMLIB_API rig_get_split_freq(RIG *rig, vfo_t vfo, freq_t *tx_freq) if (caps->get_freq && (caps->targetable_vfo & RIG_TARGETABLE_FREQ)) { - RETURNFUNC(caps->get_freq(rig, tx_vfo, tx_freq)); + retcode = caps->get_freq(rig, tx_vfo, tx_freq); + RETURNFUNC(retcode); } @@ -3723,7 +3733,8 @@ int HAMLIB_API rig_set_split_mode(RIG *rig, || vfo == RIG_VFO_TX || vfo == rig->state.current_vfo)) { - RETURNFUNC(caps->set_split_mode(rig, vfo, tx_mode, tx_width)); + retcode = caps->set_split_mode(rig, vfo, tx_mode, tx_width); + RETURNFUNC(retcode); } /* Assisted mode */ @@ -3741,7 +3752,8 @@ int HAMLIB_API rig_set_split_mode(RIG *rig, if (caps->set_mode && (caps->targetable_vfo & RIG_TARGETABLE_MODE)) { - RETURNFUNC(caps->set_mode(rig, tx_vfo, tx_mode, tx_width)); + retcode = caps->set_mode(rig, tx_vfo, tx_mode, tx_width); + RETURNFUNC(retcode); } @@ -3832,7 +3844,8 @@ int HAMLIB_API rig_get_split_mode(RIG *rig, vfo_t vfo, rmode_t *tx_mode, || vfo == RIG_VFO_TX || vfo == rig->state.current_vfo)) { - RETURNFUNC(caps->get_split_mode(rig, vfo, tx_mode, tx_width)); + retcode = caps->get_split_mode(rig, vfo, tx_mode, tx_width); + RETURNFUNC(retcode); } /* Assisted mode */ @@ -3850,7 +3863,8 @@ int HAMLIB_API rig_get_split_mode(RIG *rig, vfo_t vfo, rmode_t *tx_mode, if (caps->get_mode && (caps->targetable_vfo & RIG_TARGETABLE_MODE)) { - RETURNFUNC(caps->get_mode(rig, tx_vfo, tx_mode, tx_width)); + retcode = caps->get_mode(rig, tx_vfo, tx_mode, tx_width); + RETURNFUNC(retcode); } @@ -4035,7 +4049,8 @@ int HAMLIB_API rig_get_split_freq_mode(RIG *rig, if (caps->get_split_freq_mode) { - RETURNFUNC(caps->get_split_freq_mode(rig, vfo, tx_freq, tx_mode, tx_width)); + retcode = caps->get_split_freq_mode(rig, vfo, tx_freq, tx_mode, tx_width); + return retcode; } retcode = rig_get_split_freq(rig, vfo, tx_freq); @@ -4292,7 +4307,8 @@ int HAMLIB_API rig_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit) || vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo) { - RETURNFUNC(caps->set_rit(rig, vfo, rit)); + retcode = caps->set_rit(rig, vfo, rit); + RETURNFUNC(retcode); } if (!caps->set_vfo) @@ -4360,7 +4376,8 @@ int HAMLIB_API rig_get_rit(RIG *rig, vfo_t vfo, shortfreq_t *rit) || vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo) { - RETURNFUNC(caps->get_rit(rig, vfo, rit)); + retcode = caps->get_rit(rig, vfo, rit); + RETURNFUNC(retcode); } if (!caps->set_vfo) @@ -4428,7 +4445,8 @@ int HAMLIB_API rig_set_xit(RIG *rig, vfo_t vfo, shortfreq_t xit) || vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo) { - RETURNFUNC(caps->set_xit(rig, vfo, xit)); + retcode = caps->set_xit(rig, vfo, xit); + RETURNFUNC(retcode); } if (!caps->set_vfo) @@ -4496,7 +4514,8 @@ int HAMLIB_API rig_get_xit(RIG *rig, vfo_t vfo, shortfreq_t *xit) || vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo) { - RETURNFUNC(caps->get_xit(rig, vfo, xit)); + retcode = caps->get_xit(rig, vfo, xit); + RETURNFUNC(retcode); } if (!caps->set_vfo) @@ -4563,7 +4582,8 @@ int HAMLIB_API rig_set_ts(RIG *rig, vfo_t vfo, shortfreq_t ts) if (vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo) { - RETURNFUNC(caps->set_ts(rig, vfo, ts)); + retcode = caps->set_ts(rig, vfo, ts); + RETURNFUNC(retcode); } if (!caps->set_vfo) @@ -4630,7 +4650,8 @@ int HAMLIB_API rig_get_ts(RIG *rig, vfo_t vfo, shortfreq_t *ts) if (vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo) { - RETURNFUNC(caps->get_ts(rig, vfo, ts)); + retcode = caps->get_ts(rig, vfo, ts); + RETURNFUNC(retcode); } if (!caps->set_vfo) @@ -4703,7 +4724,8 @@ int HAMLIB_API rig_set_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t option) || vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo) { - RETURNFUNC(caps->set_ant(rig, vfo, ant, option)); + retcode = caps->set_ant(rig, vfo, ant, option); + RETURNFUNC(retcode); } if (!caps->set_vfo) @@ -4778,7 +4800,8 @@ int HAMLIB_API rig_get_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t *option, || vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo) { - RETURNFUNC(caps->get_ant(rig, vfo, ant, option, ant_curr, ant_tx, ant_rx)); + retcode = caps->get_ant(rig, vfo, ant, option, ant_curr, ant_tx, ant_rx); + RETURNFUNC(retcode); } if (!caps->set_vfo) @@ -4983,6 +5006,8 @@ shortfreq_t HAMLIB_API rig_get_resolution(RIG *rig, rmode_t mode) */ int HAMLIB_API rig_set_powerstat(RIG *rig, powerstat_t status) { + int retcode; + ENTERFUNC; if (CHECK_RIG_ARG(rig)) @@ -4996,7 +5021,8 @@ int HAMLIB_API rig_set_powerstat(RIG *rig, powerstat_t status) RETURNFUNC(-RIG_ENAVAIL); } - RETURNFUNC(rig->caps->set_powerstat(rig, status)); + retcode = rig->caps->set_powerstat(rig, status); + RETURNFUNC(retcode); } @@ -5016,6 +5042,8 @@ int HAMLIB_API rig_set_powerstat(RIG *rig, powerstat_t status) */ int HAMLIB_API rig_get_powerstat(RIG *rig, powerstat_t *status) { + int retcode; + ENTERFUNC; if (CHECK_RIG_ARG(rig) || !status) @@ -5028,7 +5056,8 @@ int HAMLIB_API rig_get_powerstat(RIG *rig, powerstat_t *status) RETURNFUNC(-RIG_ENAVAIL); } - RETURNFUNC(rig->caps->get_powerstat(rig, status)); + retcode = rig->caps->get_powerstat(rig, status); + RETURNFUNC(retcode); } @@ -5048,6 +5077,8 @@ int HAMLIB_API rig_get_powerstat(RIG *rig, powerstat_t *status) */ int HAMLIB_API rig_reset(RIG *rig, reset_t reset) { + int retcode; + ENTERFUNC; if (CHECK_RIG_ARG(rig)) @@ -5060,7 +5091,8 @@ int HAMLIB_API rig_reset(RIG *rig, reset_t reset) RETURNFUNC(-RIG_ENAVAIL); } - RETURNFUNC(rig->caps->reset(rig, reset)); + retcode = rig->caps->reset(rig, reset); + RETURNFUNC(retcode); } @@ -5150,6 +5182,8 @@ int HAMLIB_API rig_probe_all(hamlib_port_t *port, */ vfo_op_t HAMLIB_API rig_has_vfo_op(RIG *rig, vfo_op_t op) { + int retcode; + ENTERFUNC; if (!rig || !rig->caps) @@ -5157,7 +5191,8 @@ vfo_op_t HAMLIB_API rig_has_vfo_op(RIG *rig, vfo_op_t op) RETURNFUNC(0); } - RETURNFUNC(rig->caps->vfo_ops & op); + retcode = rig->caps->vfo_ops & op; + RETURNFUNC(retcode); } @@ -5199,7 +5234,8 @@ int HAMLIB_API rig_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op) if (vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo) { - RETURNFUNC(caps->vfo_op(rig, vfo, op)); + retcode = caps->vfo_op(rig, vfo, op); + RETURNFUNC(retcode); } if (!caps->set_vfo) @@ -5247,6 +5283,8 @@ int HAMLIB_API rig_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op) */ scan_t HAMLIB_API rig_has_scan(RIG *rig, scan_t scan) { + int retcode; + ENTERFUNC; if (!rig || !rig->caps) @@ -5254,7 +5292,8 @@ scan_t HAMLIB_API rig_has_scan(RIG *rig, scan_t scan) RETURNFUNC(0); } - RETURNFUNC(rig->caps->scan_ops & scan); + retcode = rig->caps->scan_ops & scan; + RETURNFUNC(retcode); } @@ -5298,7 +5337,8 @@ int HAMLIB_API rig_scan(RIG *rig, vfo_t vfo, scan_t scan, int ch) if (vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo) { - RETURNFUNC(caps->scan(rig, vfo, scan, ch)); + retcode = caps->scan(rig, vfo, scan, ch); + RETURNFUNC(retcode); } if (!caps->set_vfo) @@ -5365,7 +5405,8 @@ int HAMLIB_API rig_send_dtmf(RIG *rig, vfo_t vfo, const char *digits) if (vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo) { - RETURNFUNC(caps->send_dtmf(rig, vfo, digits)); + retcode = caps->send_dtmf(rig, vfo, digits); + RETURNFUNC(retcode); } if (!caps->set_vfo) @@ -5433,7 +5474,8 @@ int HAMLIB_API rig_recv_dtmf(RIG *rig, vfo_t vfo, char *digits, int *length) if (vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo) { - RETURNFUNC(caps->recv_dtmf(rig, vfo, digits, length)); + retcode = caps->recv_dtmf(rig, vfo, digits, length); + RETURNFUNC(retcode); } if (!caps->set_vfo) @@ -5500,7 +5542,8 @@ int HAMLIB_API rig_send_morse(RIG *rig, vfo_t vfo, const char *msg) if (vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo) { - RETURNFUNC(caps->send_morse(rig, vfo, msg)); + retcode = caps->send_morse(rig, vfo, msg); + RETURNFUNC(retcode); } if (!caps->set_vfo) @@ -5715,7 +5758,8 @@ int HAMLIB_API rig_send_voice_mem(RIG *rig, vfo_t vfo, int ch) if (vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo) { - RETURNFUNC(caps->send_voice_mem(rig, vfo, ch)); + retcode = caps->send_voice_mem(rig, vfo, ch); + RETURNFUNC(retcode); } if (!caps->set_vfo) @@ -5791,6 +5835,8 @@ const freq_range_t *HAMLIB_API rig_get_range(const freq_range_t *range_list, */ int HAMLIB_API rig_set_vfo_opt(RIG *rig, int status) { + int retcode; + ENTERFUNC; if (rig->caps->set_vfo_opt == NULL) @@ -5798,7 +5844,8 @@ int HAMLIB_API rig_set_vfo_opt(RIG *rig, int status) RETURNFUNC(-RIG_ENAVAIL); } - RETURNFUNC(rig->caps->set_vfo_opt(rig, status)); + retcode = rig->caps->set_vfo_opt(rig, status); + RETURNFUNC(retcode); } /**