From f5135650b37acb0c033952ed5174a4aed16c8f54 Mon Sep 17 00:00:00 2001 From: Michael Black W9MDB Date: Wed, 3 Mar 2021 09:33:29 -0600 Subject: [PATCH] Add constants for sprintflst.c https://github.com/Hamlib/Hamlib/issues/580 --- include/hamlib/rig.h | 5 +++++ src/sprintflst.c | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h index 7d713239e..17fe9a101 100644 --- a/include/hamlib/rig.h +++ b/include/hamlib/rig.h @@ -186,6 +186,11 @@ typedef struct s_rig RIG; #define MAXDBLSTSIZ 8 /* max preamp/att levels supported, zero ended */ #define CHANLSTSIZ 16 /* max mem_list size, zero ended */ #define MAX_CAL_LENGTH 32 /* max calibration plots in cal_table_t */ +#define MAX_MODES 63 +#define MAX_VFOS 31 +#define MAX_ROTORS 63 +#define MAX_VFO_OPS 31 +#define MAX_RSCANS 31 //! @endcond diff --git a/src/sprintflst.c b/src/sprintflst.c index 1bce89480..00e217c99 100644 --- a/src/sprintflst.c +++ b/src/sprintflst.c @@ -49,7 +49,7 @@ int rig_sprintf_vfo(char *str, int nlen, vfo_t vfo) return 0; } - for (i = 0; i < 32; i++) + for (i = 0; i < MAX_VFOS; i++) { const char *sv; sv = rig_strvfo(vfo & RIG_VFO_N(i)); @@ -75,7 +75,7 @@ int rig_sprintf_mode(char *str, int nlen, rmode_t mode) return 0; } - for (i = 0; i < 63; i++) + for (i = 0; i < MAX_MODES; i++) { const char *ms = rig_strrmode(mode & (1ULL << i)); @@ -618,7 +618,7 @@ int rig_sprintf_vfop(char *str, int nlen, vfo_op_t op) return 0; } - for (i = 0; i < 30; i++) + for (i = 0; i < MAX_VFO_OPS; i++) { const char *ms = rig_strvfop(op & (1UL << i)); @@ -647,7 +647,7 @@ int rig_sprintf_scan(char *str, int nlen, scan_t rscan) return 0; } - for (i = 0; i < 30; i++) + for (i = 0; i < MAX_RSCANS; i++) { const char *ms = rig_strscan(rscan & (1UL << i)); @@ -677,7 +677,7 @@ int rot_sprintf_status(char *str, int nlen, rot_status_t status) return 0; } - for (i = 0; i < 32; i++) + for (i = 0; i < MAX_ROTORS; i++) { const char *sv; sv = rot_strstatus(status & ROT_STATUS_N(i));