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

DISK: Cleanup compiler warnings

Browse source
This commit is contained in:
Mark Pizzolato 2020-04-30 02:59:30 -07:00
parent 807005553b
commit 0b3e415b8e
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sim_disk.c
View file

@ -2737,7 +2737,7 @@ if (container_size && (container_size != (t_offset)-1)) {
} }
} }
else else
sim_messagef (SCPE_OK, "%s: No File System found on '%s', skipping autosizing\.n", sim_uname (uptr), cptr); sim_messagef (SCPE_OK, "%s: No File System found on '%s', skipping autosizing\n", sim_uname (uptr), cptr);
} }
if ((container_size != current_unit_size) && if ((container_size != current_unit_size) &&
((DKUF_F_VHD == DK_GET_FMT (uptr)) || (0 != (uptr->flags & UNIT_RO)) || ((DKUF_F_VHD == DK_GET_FMT (uptr)) || (0 != (uptr->flags & UNIT_RO)) ||
@ -4400,7 +4400,7 @@ typedef struct _VHD_DynamicDiskHeader {
typedef struct VHD_IOData *VHDHANDLE; typedef struct VHD_IOData *VHDHANDLE;
static t_stat ReadFilePosition(FILE *File, void *buf, size_t bufsize, size_t *bytesread, uint64 position) static t_stat ReadFilePosition(FILE *File, void *buf, size_t bufsize, uint32 *bytesread, uint64 position)
{ {
uint32 err = sim_fseeko (File, (t_offset)position, SEEK_SET); uint32 err = sim_fseeko (File, (t_offset)position, SEEK_SET);
size_t i; size_t i;
@ -4410,13 +4410,13 @@ if (bytesread)
if (!err) { if (!err) {
i = fread (buf, 1, bufsize, File); i = fread (buf, 1, bufsize, File);
if (bytesread) if (bytesread)
*bytesread = i; *bytesread = (uint32)i;
err = ferror (File); err = ferror (File);
} }
return (err ? SCPE_IOERR : SCPE_OK); return (err ? SCPE_IOERR : SCPE_OK);
} }
static t_stat WriteFilePosition(FILE *File, void *buf, size_t bufsize, size_t *byteswritten, uint64 position) static t_stat WriteFilePosition(FILE *File, void *buf, size_t bufsize, uint32 *byteswritten, uint64 position)
{ {
uint32 err = sim_fseeko (File, (t_offset)position, SEEK_SET); uint32 err = sim_fseeko (File, (t_offset)position, SEEK_SET);
size_t i; size_t i;
@ -4426,7 +4426,7 @@ if (byteswritten)
if (!err) { if (!err) {
i = fwrite (buf, 1, bufsize, File); i = fwrite (buf, 1, bufsize, File);
if (byteswritten) if (byteswritten)
*byteswritten = i; *byteswritten = (uint32)i;
err = ferror (File); err = ferror (File);
} }
return (err ? SCPE_IOERR : SCPE_OK); return (err ? SCPE_IOERR : SCPE_OK);
@ -4884,7 +4884,7 @@ static FILE *sim_vhd_disk_merge (const char *szVHDPath, char **ParentVHD)
int Status; int Status;
uint32 SectorSize, SectorsPerBlock, BlockSize, BlockNumber, BitMapBytes, BitMapSectors, BlocksToMerge, NeededBlock; uint32 SectorSize, SectorsPerBlock, BlockSize, BlockNumber, BitMapBytes, BitMapSectors, BlocksToMerge, NeededBlock;
uint64 BlockOffset; uint64 BlockOffset;
size_t BytesRead; uint32 BytesRead;
t_seccnt SectorsWritten; t_seccnt SectorsWritten;
void *BlockData = NULL; void *BlockData = NULL;