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

DISK, TAPE: Remove compiler and Coverity warnings

Browse source
This commit is contained in:
Mark Pizzolato 2019-11-24 10:55:25 -08:00
parent 6df860ea1a
commit 519ef27def
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sim_disk.c
View file

@ -1123,7 +1123,7 @@ t_seccnt sects_read;
if ((dptr = find_dev_from_unit (uptr)) == NULL) if ((dptr = find_dev_from_unit (uptr)) == NULL)
return ret_val; return ret_val;
saved_capac = uptr->capac; saved_capac = uptr->capac;
uptr->capac = temp_capac; uptr->capac = (t_addr)temp_capac;
if ((sim_disk_rdsect (uptr, 512 / ctx->sector_size, (uint8 *)&Home, &sects_read, sizeof (Home) / ctx->sector_size)) || if ((sim_disk_rdsect (uptr, 512 / ctx->sector_size, (uint8 *)&Home, &sects_read, sizeof (Home) / ctx->sector_size)) ||
(sects_read != (sizeof (Home) / ctx->sector_size))) (sects_read != (sizeof (Home) / ctx->sector_size)))
goto Return_Cleanup; goto Return_Cleanup;

4
sim_tape.c
View file

@ -3274,9 +3274,11 @@ tape_size = (t_addr)sim_fsize (uptr->fileref);
sim_debug_unit (MTSE_DBG_STR, uptr, "tpc_map: tape_size: %" T_ADDR_FMT "u\n", tape_size); sim_debug_unit (MTSE_DBG_STR, uptr, "tpc_map: tape_size: %" T_ADDR_FMT "u\n", tape_size);
for (objc = 0, sizec = 0, tpos = 0;; ) { for (objc = 0, sizec = 0, tpos = 0;; ) {
(void)sim_tape_seek (uptr, tpos); (void)sim_tape_seek (uptr, tpos);
i = sim_fread (&bc, sizeof (t_tpclnt), 1, uptr->fileref); i = sim_fread (&bc, sizeof (bc), 1, uptr->fileref);
if (i == 0) /* past or at eof? */ if (i == 0) /* past or at eof? */
break; break;
if (bc > 65535) /* Range check length value to satisfy Coverity */
break;
if (countmap[bc] == 0) if (countmap[bc] == 0)
sizec++; sizec++;
++countmap[bc]; ++countmap[bc];