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

CARD: Cleanup coverity taint errors.

Browse source
This commit is contained in:
Richard Cornwell 2019-11-03 18:53:07 -05:00
parent 58c5fe417f
commit bbfa391924
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sim_card.c
View file

@ -599,12 +599,12 @@ sim_card_eof(UNIT *uptr)
struct _card_buffer { struct _card_buffer {
char buffer[8192+500]; /* Buffer data */ uint8 buffer[8192+500]; /* Buffer data */
int len; /* Amount of data in buffer */ int len; /* Amount of data in buffer */
int size; /* Size of last card read */ int size; /* Size of last card read */
}; };
static int _cmpcard(const char *p, const char *s) { static int _cmpcard(const uint8 *p, const char *s) {
int i; int i;
if (p[0] != '~') if (p[0] != '~')
return 0; return 0;
@ -629,7 +629,7 @@ _sim_parse_card(UNIT *uptr, DEVICE *dptr, struct _card_buffer *buf, uint16 (*ima
/* Check buffer to see if binary card in it. */ /* Check buffer to see if binary card in it. */
for (i = 0, temp = 0; i < 160 && i <buf->len; i+=2) for (i = 0, temp = 0; i < 160 && i <buf->len; i+=2)
temp |= buf->buffer[i]; temp |= (uint16)(buf->buffer[i] & 0xFF);
/* Check if every other char < 16 & full buffer */ /* Check if every other char < 16 & full buffer */
if ((temp & 0x0f) == 0 && i == 160) if ((temp & 0x0f) == 0 && i == 160)
mode = MODE_BIN; /* Probably binary */ mode = MODE_BIN; /* Probably binary */
@ -789,9 +789,9 @@ _sim_parse_card(UNIT *uptr, DEVICE *dptr, struct _card_buffer *buf, uint16 (*ima
} }
/* Move data to buffer */ /* Move data to buffer */
for (col = i = 0; i < 160;) { for (col = i = 0; i < 160;) {
temp |= buf->buffer[i]; temp |= (uint16)(buf->buffer[i] & 0xff);
(*image)[col] = (buf->buffer[i++] >> 4) & 0xF; (*image)[col] = (buf->buffer[i++] >> 4) & 0xF;
(*image)[col++] |= ((uint16)buf->buffer[i++]) << 4; (*image)[col++] |= ((uint16)buf->buffer[i++] & 0xf) << 4;
} }
/* Check if format error */ /* Check if format error */
if (temp & 0xF) if (temp & 0xF)
@ -802,8 +802,8 @@ _sim_parse_card(UNIT *uptr, DEVICE *dptr, struct _card_buffer *buf, uint16 (*ima
case MODE_CBN: case MODE_CBN:
sim_debug(DEBUG_CARD, dptr, "cbn\n"); sim_debug(DEBUG_CARD, dptr, "cbn\n");
/* Check if first character is a tape mark */ /* Check if first character is a tape mark */
if (((uint8)buf->buffer[0]) == 0217 && if (buf->buffer[0] == 0217 &&
(buf->len == 1 || (((uint8)buf->buffer[1]) & 0200) != 0)) { (buf->len == 1 || (buf->buffer[1] & 0200) != 0)) {
i = 1; i = 1;
(*image)[0] |= CARD_EOF; (*image)[0] |= CARD_EOF;
break; break;
@ -844,7 +844,7 @@ _sim_parse_card(UNIT *uptr, DEVICE *dptr, struct _card_buffer *buf, uint16 (*ima
case MODE_BCD: case MODE_BCD:
sim_debug(DEBUG_CARD, dptr, "bcd ["); sim_debug(DEBUG_CARD, dptr, "bcd [");
/* Check if first character is a tape mark */ /* Check if first character is a tape mark */
if (((uint8)buf->buffer[0]) == 0217 && (((uint8)buf->buffer[1]) & 0200) != 0) { if (buf->buffer[0] == 0217 && (buf->buffer[1] & 0200) != 0) {
i = 1; i = 1;
(*image)[0] |= CARD_EOF; (*image)[0] |= CARD_EOF;
break; break;
@ -885,7 +885,7 @@ _sim_parse_card(UNIT *uptr, DEVICE *dptr, struct _card_buffer *buf, uint16 (*ima
(*image)[0] |= CARD_ERR; (*image)[0] |= CARD_ERR;
/* Move data to buffer */ /* Move data to buffer */
for (i = 0; i < 80 && i < buf->len; i++) { for (i = 0; i < 80 && i < buf->len; i++) {
temp = buf->buffer[i] & 0xFF; temp = (uint16)(buf->buffer[i]) & 0xFF;
(*image)[i] = ebcdic_to_hol[temp]; (*image)[i] = ebcdic_to_hol[temp];
} }
break; break;