From 2ea9a30ea663d515beefbf7ea40038456fd22492 Mon Sep 17 00:00:00 2001 From: George Baltz N3GB Date: Tue, 30 Dec 2025 13:47:34 -0500 Subject: [PATCH] More cppcheck stuff What started out as some cppcheck cleanups turned into a trip down the rabbit-hole that is neverused.c, a mix of dummy calls to avoid cppcheck warnings and tracers for routines that either don't exist anymore or are #ifdef'ed out. - Make it compile with '-std=c89' (no function prototypes) - Get rid of the calls to routines that were removed. - Remove some of the calls that are used elsewhere. - Not complete TODO: The XXREMOVEDXX routines should be examinied to see if they are really needed or will be implemented in the future, and if not removed completely. And/or maybe just delete neverused.c. --- src/cm108.c | 2 +- src/event.c | 2 +- src/neverused.c | 149 ++++++++++++------------------------------------ 3 files changed, 38 insertions(+), 115 deletions(-) diff --git a/src/cm108.c b/src/cm108.c index 1bfbd7e7d..11fec0952 100644 --- a/src/cm108.c +++ b/src/cm108.c @@ -367,7 +367,7 @@ int cm108_ptt_get(hamlib_port_t *p, ptt_t *pttx) } -#ifdef XXREMOVEXX +#ifdef XXREMOVEDXX // Not referenced anywhere /** * \brief get Data Carrier Detect (squelch) from CM108 GPIO diff --git a/src/event.c b/src/event.c index 78c5b9624..8142d5555 100644 --- a/src/event.c +++ b/src/event.c @@ -61,7 +61,7 @@ typedef struct rig_poll_routine_priv_data_s rig_poll_routine_args args; } rig_poll_routine_priv_data; -void *rig_poll_routine(void *arg) +static void *rig_poll_routine(void *arg) { rig_poll_routine_args *args = (rig_poll_routine_args *)arg; RIG *rig = args->rig; diff --git a/src/neverused.c b/src/neverused.c index 004c589c0..3dc756350 100644 --- a/src/neverused.c +++ b/src/neverused.c @@ -1,29 +1,45 @@ -// These function are not referenced anywhere inside hamlib -// according to cppcheck -// Some are marked with XXREMOVEDXX in the code are are -// subject to being deprecated in a future release - -void used_externally() +/* These function are not referenced anywhere inside hamlib + * according to cppcheck + * Some are marked with XXREMOVEDXX in the code and are + * subject to being deprecated in a future release + */ +static void used_externally() { - uh_close_wkey(); // used by external programs - uh_open_wkey(); // used by external programs - rig_mem_count(); // referenced by rig.swg and tcl + uh_close_wkey(); /* used by external programs */ + uh_open_wkey(); /* used by external programs */ + /* HAMLIB API functions */ + amp_ext_level_foreach(); + amp_ext_lookup_tok(); + amp_ext_parm_foreach(); + amp_ext_token_lookup(); + amp_probe_all(); + amp_unregister(); + rig_copy_channel(); + rig_copyright(); + rig_ext_token_lookup(); + rig_get_mem_all(); + rig_get_mem_all_cb(); + rig_license(); + rig_mem_count(); /* referenced by rig.swg and tcl */ + rig_parse_mtype(); + rig_probe_all(); + rig_set_debug_callback(); + rig_set_debug_file(); + rig_set_mem_all(); + rig_set_mem_all_cb(); + rig_set_pltune_callback(); + rig_unregister(); + rot_probe_all(); + rot_unregister(); } -void never_used() +static void never_used() { adat_mode_anr2rnr(); adat_parse_vfo(); adat_ptt_rnr2anr(); agcToHamlib(); agcToNative(); - amp_ext_level_foreach(); - amp_ext_lookup_tok(); - amp_ext_parm_foreach(); - amp_ext_token_lookup(); - amp_probe_all(); - amp_set_powerstat(); - amp_unregister(); cm108_dcd_get(); CtrlHandler(); elad_close(); @@ -55,83 +71,31 @@ void never_used() getCalLevel(); getFilterBW(); getopt_long_only(); - get_output_freq(); gp2000_get_func(); gp2000_set_func(); hzToDDS(); hzToPBS(); i2c_read(); - ic10_set_ptt(); - ic9100_get_level(); - ic9100_set_level(); icmarine_cleanup(); icmarine_get_conf(); icmarine_get_dcd(); icmarine_get_func(); icmarine_get_level(); icmarine_get_mode(); - icmarine_get_ptt(); icmarine_get_split_vfo(); icmarine_get_tx_freq(); - icmarine_init(); icmarine_open(); icmarine_set_conf(); icmarine_set_freq(); icmarine_set_func(); icmarine_set_level(); icmarine_set_mode(); - icmarine_set_ptt(); icmarine_set_split_vfo(); - icmarine_vfo_op(); - icmarine_vfo_op(); - icom_get_ctcss_sql(); - icom_get_ctcss_tone(); - icom_get_dcs_code(); - icom_get_dcs_sql(); - icom_get_ext_func(); - icom_get_ext_level(); - icom_get_ext_parm(); icom_get_freq_range(); - icom_get_func(); - icom_get_level_raw(); - icom_get_mode_with_data(); - icom_get_parm(); - icom_get_powerstat(); - icom_get_ptt(); - icom_get_rit_new(); - icom_get_rptr_offs(); - icom_get_rptr_shift(); - icom_get_split_freq_mode(); - icom_get_vfo(); - icom_mem_get_split_vfo(); - icom_mW2power(); - icom_power2mW(); - icom_send_morse(); - icom_send_voice_mem(); - icom_stop_morse(); - icom_set_bank(); - icom_set_ctcss_sql(); - icom_set_ctcss_tone(); - icom_set_dcs_code(); - icom_set_dcs_sql(); - icom_set_dsp_flt(); - icom_set_ext_func(); - icom_set_ext_level(); - icom_set_ext_parm(); - icom_set_func(); - icom_set_level_raw(); - icom_set_mode_with_data(); - icom_set_parm(); - icom_set_powerstat(); - icom_set_ptt(); - icom_set_rit_new(); - icom_set_rptr_offs(); - icom_set_rptr_shift(); - icom_set_split_freq_mode(); - icom_set_xit_new(); int2BCD(); is_uh_radio_fd(); lockRx(); + /* Android stuff */ lt_dladdsearchdir(); lt_dlclose(); lt_dlerror(); @@ -140,16 +104,14 @@ void never_used() lt_dlopen(); lt_dlopenext(); lt_dlsym(); - miniVNA_get_info(); + /* */ modeToHamlib(); modeToNative(); newcat_decode_event(); newcat_get_dcd(); newcat_get_dcs_code(); newcat_get_dcs_sql(); - newcat_get_ext_level(); newcat_get_ext_parm(); - newcat_get_parm(); newcat_get_rptr_offs(); newcat_get_split_freq(); newcat_get_split_mode(); @@ -157,27 +119,21 @@ void never_used() newcat_get_tone_sql(); newcat_recv_dtmf(); newcat_reset(); - newcat_scan(); newcat_send_dtmf(); - newcat_send_morse(); newcat_set_bank(); newcat_set_dcs_code(); newcat_set_dcs_sql(); - newcat_set_ext_level(); newcat_set_ext_parm(); - newcat_set_parm(); newcat_set_rptr_offs(); newcat_set_split_freq(); newcat_set_split_mode(); newcat_set_tone(); newcat_set_tone_sql(); - optoscan_close(); optoscan_get_ctcss_tone(); optoscan_get_dcs_code(); optoscan_get_ext_parm(); optoscan_get_info(); optoscan_get_level(); - optoscan_open(); optoscan_recv_dtmf(); optoscan_scan(); optoscan_set_ext_parm(); @@ -207,44 +163,12 @@ void never_used() ra37xx_set_mode(); ra37xx_vfo_op(); read3Bytes(); - read_info(); readInt(); readShort(); readSignal(); - rig_copy_channel(); - rig_copyright(); - rig_ext_token_lookup(); - rig_get_mem_all(); - rig_get_mem_all_cb(); - rig_license(); - rig_parse_mtype(); - rig_probe_all(); - rig_send_voice_mem(); - rig_set_bank(); - rig_set_debug_callback(); - rig_set_debug_file(); - rig_set_ext_func(); - rig_set_mem_all(); - rig_set_mem_all_cb(); - rig_set_pltune_callback(); - rig_set_twiddle(); - rig_unregister(); - rig_version(); - rot_probe_all(); - rot_unregister(); sendIRCode(); set_parm_all_cb_generic(); - sprintf_level(); sprintf_level_ext(); - sprintf_parm(); - tentec_cleanup(); - tentec_get_freq(); - tentec_get_info(); - tentec_get_level(); - tentec_get_mode(); - tentec_init(); - tentec_set_level(); - tentec_set_mode(); tentec_trx_open(); thd72_get_chan_all_cb(); thd74_get_chan_all_cb(); @@ -283,12 +207,11 @@ void never_used() wj_set_level(); wj_set_mode(); write3Bytes(); - write_both_dacs(); writeInt(); writeShort(); } -main() +int main() { used_externally(); never_used();