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

SCP: Silence Coverity warnings

Browse source
This commit is contained in:
Mark Pizzolato 2017-03-31 18:54:18 -07:00
parent 3af3a8ea54
commit 064c8e54a8
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sim_disk.c
View file

@ -1086,7 +1086,7 @@ ODS2_FileHeader Header;
ODS2_Retreval *Retr; ODS2_Retreval *Retr;
ODS2_SCB Scb; ODS2_SCB Scb;
uint16 CheckSum1, CheckSum2; uint16 CheckSum1, CheckSum2;
uint32 ScbLbn; uint32 ScbLbn = 0;
t_offset ret_val = (t_offset)-1; t_offset ret_val = (t_offset)-1;
if ((dptr = find_dev_from_unit (uptr)) == NULL) if ((dptr = find_dev_from_unit (uptr)) == NULL)
@ -2605,7 +2605,8 @@ t_offset pos, size;
pos = (t_offset)lseek ((int)((long)f), (off_t)0, SEEK_CUR); pos = (t_offset)lseek ((int)((long)f), (off_t)0, SEEK_CUR);
size = (t_offset)lseek ((int)((long)f), (off_t)0, SEEK_END); size = (t_offset)lseek ((int)((long)f), (off_t)0, SEEK_END);
lseek ((int)((long)f), (off_t)pos, SEEK_SET); if (pos != (t_offset)-1)
(void)lseek ((int)((long)f), (off_t)pos, SEEK_SET);
return size; return size;
} }
@ -3651,7 +3652,7 @@ static FILE *sim_vhd_disk_merge (const char *szVHDPath, char **ParentVHD)
continue; continue;
++NeededBlock; ++NeededBlock;
BlockOffset = SectorSize*((uint64)(NtoHl (hVHD->BAT[BlockNumber]) + BitMapSectors)); BlockOffset = SectorSize*((uint64)(NtoHl (hVHD->BAT[BlockNumber]) + BitMapSectors));
if ((BlockNumber*SectorsPerBlock + BlockSectors) > ((uint64)NtoHll (hVHD->Footer.CurrentSize))/SectorSize) if (((uint64)BlockNumber*SectorsPerBlock + BlockSectors) > ((uint64)NtoHll (hVHD->Footer.CurrentSize))/SectorSize)
BlockSectors = (uint32)(((uint64)NtoHll (hVHD->Footer.CurrentSize))/SectorSize - (BlockNumber*SectorsPerBlock)); BlockSectors = (uint32)(((uint64)NtoHll (hVHD->Footer.CurrentSize))/SectorSize - (BlockNumber*SectorsPerBlock));
if (ReadFilePosition(hVHD->File, if (ReadFilePosition(hVHD->File,
BlockData, BlockData,

8
sim_sock.c
View file

@ -1127,9 +1127,9 @@ FD_ZERO (er_p);
FD_SET (sock, rw_p); FD_SET (sock, rw_p);
FD_SET (sock, er_p); FD_SET (sock, er_p);
if (rd) if (rd)
select ((int) sock + 1, rw_p, NULL, er_p, &zero); (void)select ((int) sock + 1, rw_p, NULL, er_p, &zero);
else else
select ((int) sock + 1, NULL, rw_p, er_p, &zero); (void)select ((int) sock + 1, NULL, rw_p, er_p, &zero);
if (FD_ISSET (sock, er_p)) if (FD_ISSET (sock, er_p))
return -1; return -1;
if (FD_ISSET (sock, rw_p)) { if (FD_ISSET (sock, rw_p)) {
@ -1200,8 +1200,8 @@ if (socknamebuf)
*socknamebuf = (char *)calloc(1, NI_MAXHOST+NI_MAXSERV+4); *socknamebuf = (char *)calloc(1, NI_MAXHOST+NI_MAXSERV+4);
if (peernamebuf) if (peernamebuf)
*peernamebuf = (char *)calloc(1, NI_MAXHOST+NI_MAXSERV+4); *peernamebuf = (char *)calloc(1, NI_MAXHOST+NI_MAXSERV+4);
getsockname (sock, (struct sockaddr *)&sockname, &socknamesize); (void)getsockname (sock, (struct sockaddr *)&sockname, &socknamesize);
getpeername (sock, (struct sockaddr *)&peername, &peernamesize); (void)getpeername (sock, (struct sockaddr *)&peername, &peernamesize);
if (socknamebuf != NULL) { if (socknamebuf != NULL) {
_sim_getaddrname ((struct sockaddr *)&sockname, (size_t)socknamesize, hostbuf, portbuf); _sim_getaddrname ((struct sockaddr *)&sockname, (size_t)socknamesize, hostbuf, portbuf);
sprintf(*socknamebuf, "[%s]:%s", hostbuf, portbuf); sprintf(*socknamebuf, "[%s]:%s", hostbuf, portbuf);