folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TMXR, ETHER: Silence potential compiler warnings

Browse source
This commit is contained in:
Mark Pizzolato 2021-06-08 13:39:20 -07:00
parent 4b03e1493a
commit 3597772a08
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sim_ether.c
View file

@ -868,7 +868,7 @@ char* eth_getdesc_byname(char* name, char* temp)
static ETH_DEV **eth_open_devices = NULL; static ETH_DEV **eth_open_devices = NULL;
static int eth_open_device_count = 0; static int eth_open_device_count = 0;
static char* (*p_pcap_lib_version) (void); static char *(*p_pcap_lib_version) (void);
static void _eth_add_to_open_list (ETH_DEV* dev) static void _eth_add_to_open_list (ETH_DEV* dev)
{ {
@ -1046,12 +1046,13 @@ typedef void * pcap_t; /* Pseudo Type to avoid compiler errors */
*/ */
static int eth_host_pcap_devices(int used, int max, ETH_LIST* list) static int eth_host_pcap_devices(int used, int max, ETH_LIST* list)
{ {
pcap_t* conn = NULL; int i;
int i, j, datalink = 0;
for (i=0; i<used; ++i) { for (i=0; i<used; ++i) {
/* Cull any non-ethernet interface types */ /* Cull any non-ethernet interface types */
#if defined(HAVE_PCAP_NETWORK) #if defined(HAVE_PCAP_NETWORK)
int j, datalink = 0;
pcap_t* conn = NULL;
char errbuf[PCAP_ERRBUF_SIZE]; char errbuf[PCAP_ERRBUF_SIZE];
conn = pcap_open_live(list[i].name, ETH_MAX_PACKET, ETH_PROMISC, PCAP_READ_TIMEOUT, errbuf); conn = pcap_open_live(list[i].name, ETH_MAX_PACKET, ETH_PROMISC, PCAP_READ_TIMEOUT, errbuf);

10
sim_tmxr.c
View file

@ -5247,8 +5247,8 @@ idx = 0; /* initialize the index
while (*cptr != '\0') { /* while characters remain in the command string */ while (*cptr != '\0') { /* while characters remain in the command string */
if (strncasecmp (cptr, "ALL;", 4) == 0) { /* if the parameter is "ALL" */ if (strncasecmp (cptr, "ALL;", 4) == 0) { /* if the parameter is "ALL" */
if (val != 0 || idx > 0 && idx <= max) /* then if some lines are restrictied or unspecified */ if ((val != 0) || ((idx > 0) && (idx <= max))) /* then if some lines are restrictied or unspecified */
for (line = (uint32) min; line <= max; line++) /* then fill them in sequentially */ for (line = (uint32)min; line <= (uint32)max; line++)/* then fill them in sequentially */
if (set [line] == FALSE) /* setting each unspecified line */ if (set [line] == FALSE) /* setting each unspecified line */
list [idx++] = line; /* into the line order */ list [idx++] = line; /* into the line order */
@ -5268,13 +5268,15 @@ while (*cptr != '\0') { /* while characters
break; /* and terminate the parse */ break; /* and terminate the parse */
} }
else if (low < min || low > max || high > max) { /* otherwise if the line number is invalid */ else if ((low < min) ||
(low > max) ||
(high > max)) { /* otherwise if the line number is invalid */
result = SCPE_SUB; /* then report the subscript is out of range */ result = SCPE_SUB; /* then report the subscript is out of range */
break; /* and terminate the parse */ break; /* and terminate the parse */
} }
else /* otherwise it's a valid range */ else /* otherwise it's a valid range */
for (line = (uint32) low; line <= high; line++) /* so add the line(s) to the order */ for (line = (uint32)low; line <= (uint32)high; line++)/* so add the line(s) to the order */
if (set [line] == FALSE) { /* if the line number has not been specified */ if (set [line] == FALSE) { /* if the line number has not been specified */
set [line] = TRUE; /* then now it is */ set [line] = TRUE; /* then now it is */
list [idx++] = line; /* and add it to the connection order */ list [idx++] = line; /* and add it to the connection order */