BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hameg-hmo: Fix two compiler warnings (-Warray-bounds). 

src/hardware/hameg-hmo/protocol.c: In function ‘hmo_scope_state_get’:
  src/hardware/hameg-hmo/protocol.c:1035:31: warning: array subscript 0 is above array bounds of ‘char *[0]’ [-Warray-bounds]
     g_free(logic_threshold_short[i]);
            ~~~~~~~~~~~~~~~~~~~~~^~~
  src/hardware/hameg-hmo/protocol.c:1035:31: warning: array subscript 0 is above array bounds of ‘char *[0]’ [-Warray-bounds]
  src/hardware/hameg-hmo/protocol.c:974:24: warning: array subscript 0 is above array bounds of ‘char *[0]’ [-Warray-bounds]
     logic_threshold_short[i] = g_strdup((*config->logic_threshold)[i]);
     ~~~~~~~~~~~~~~~~~~~~~^~~
  src/hardware/hameg-hmo/protocol.c:974:24: warning: array subscript 0 is above array bounds of ‘char *[0]’ [-Warray-bounds]
This commit is contained in:
Uwe Hermann 2019-07-30 20:17:32 +02:00
parent 97a000748a
commit c38d69adf4
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/hardware/hameg-hmo/protocol.c
View File

@ -183,6 +183,9 @@ static const char *logic_threshold_rtb200x_rtm300x[] = {
"MAN", // overwritten by logic_threshold_custom "MAN", // overwritten by logic_threshold_custom
}; };
/* This might need updates whenever logic_threshold* above change. */
#define MAX_NUM_LOGIC_THRESHOLD_ENTRIES ARRAY_SIZE(logic_threshold)
/* RTC1002, HMO Compact2 and HMO1002/HMO1202 */ /* RTC1002, HMO Compact2 and HMO1002/HMO1202 */
static const char *an2_dig8_trigger_sources[] = { static const char *an2_dig8_trigger_sources[] = {
"CH1", "CH2", "CH1", "CH2",
@ -942,7 +945,7 @@ static int digital_channel_state_get(struct sr_dev_inst *sdi,
{ {
unsigned int i, idx; unsigned int i, idx;
int result = SR_ERR; int result = SR_ERR;
static char *logic_threshold_short[] = {}; char *logic_threshold_short[MAX_NUM_LOGIC_THRESHOLD_ENTRIES];
char command[MAX_COMMAND_SIZE]; char command[MAX_COMMAND_SIZE];
struct sr_channel *ch; struct sr_channel *ch;
struct sr_scpi_dev_inst *scpi = sdi->conn; struct sr_scpi_dev_inst *scpi = sdi->conn;