Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-30 07:58:56 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Rename ioprocs parameters from "generic" which MS C++ compiler treats as keyword when compiling with /ZW

Browse Source
This commit is contained in:
Brad Hughes 2016-03-16 16:51:12 -04:00
parent 1ed5e0df43
commit 5d4c65c071
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/lib/formats/ioprocs.cpp
View File

@ -121,49 +121,49 @@ const struct io_procs corefile_ioprocs_noclose =
calls for accessing generic IO
*********************************************************************/
static void io_generic_seek(struct io_generic *generic, UINT64 offset)
static void io_generic_seek(struct io_generic *genio, UINT64 offset)
{
generic->procs->seekproc(generic->file, offset, SEEK_SET);
genio->procs->seekproc(genio->file, offset, SEEK_SET);
}
void io_generic_close(struct io_generic *generic)
void io_generic_close(struct io_generic *genio)
{
if (generic->procs->closeproc)
generic->procs->closeproc(generic->file);
if (genio->procs->closeproc)
genio->procs->closeproc(genio->file);
}
void io_generic_read(struct io_generic *generic, void *buffer, UINT64 offset, size_t length)
void io_generic_read(struct io_generic *genio, void *buffer, UINT64 offset, size_t length)
{
UINT64 size;
size_t bytes_read;
size = io_generic_size(generic);
size = io_generic_size(genio);
if (size <= offset)
{
bytes_read = 0;
}
else
{
io_generic_seek(generic, offset);
bytes_read = generic->procs->readproc(generic->file, buffer, length);
io_generic_seek(genio, offset);
bytes_read = genio->procs->readproc(genio->file, buffer, length);
}
memset(((UINT8 *) buffer) + bytes_read, generic->filler, length - bytes_read);
memset(((UINT8 *) buffer) + bytes_read, genio->filler, length - bytes_read);
}
void io_generic_write(struct io_generic *generic, const void *buffer, UINT64 offset, size_t length)
void io_generic_write(struct io_generic *genio, const void *buffer, UINT64 offset, size_t length)
{
UINT64 filler_size = 0;
char filler_buffer[1024];
size_t bytes_to_write;
UINT64 size;
size = io_generic_size(generic);
size = io_generic_size(genio);
if (size < offset)
{
@ -171,27 +171,27 @@ void io_generic_write(struct io_generic *generic, const void *buffer, UINT64 off
offset = size;
}
io_generic_seek(generic, offset);
io_generic_seek(genio, offset);
if (filler_size)
{
memset(filler_buffer, generic->filler, sizeof(filler_buffer));
memset(filler_buffer, genio->filler, sizeof(filler_buffer));
do
{
bytes_to_write = (filler_size > sizeof(filler_buffer)) ? sizeof(filler_buffer) : (size_t) filler_size;
generic->procs->writeproc(generic->file, filler_buffer, bytes_to_write);
genio->procs->writeproc(genio->file, filler_buffer, bytes_to_write);
filler_size -= bytes_to_write;
}
while(filler_size > 0);
}
if (length > 0)
generic->procs->writeproc(generic->file, buffer, length);
genio->procs->writeproc(genio->file, buffer, length);
}
void io_generic_write_filler(struct io_generic *generic, UINT8 filler, UINT64 offset, size_t length)
void io_generic_write_filler(struct io_generic *genio, UINT8 filler, UINT64 offset, size_t length)
{
UINT8 buffer[512];
size_t this_length;
@ -201,7 +201,7 @@ void io_generic_write_filler(struct io_generic *generic, UINT8 filler, UINT64 of
while(length > 0)
{
this_length = MIN(length, sizeof(buffer));
io_generic_write(generic, buffer, offset, this_length);
io_generic_write(genio, buffer, offset, this_length);
offset += this_length;
length -= this_length;
}
@ -209,7 +209,7 @@ void io_generic_write_filler(struct io_generic *generic, UINT8 filler, UINT64 of
UINT64 io_generic_size(struct io_generic *generic)
UINT64 io_generic_size(struct io_generic *genio)
{
return generic->procs->filesizeproc(generic->file);
return genio->procs->filesizeproc(genio->file);
}

10
src/lib/formats/ioprocs.h
View File

@ -61,11 +61,11 @@ extern const struct io_procs corefile_ioprocs_noclose;
void io_generic_close(struct io_generic *generic);
void io_generic_read(struct io_generic *generic, void *buffer, UINT64 offset, size_t length);
void io_generic_write(struct io_generic *generic, const void *buffer, UINT64 offset, size_t length);
void io_generic_write_filler(struct io_generic *generic, UINT8 filler, UINT64 offset, size_t length);
UINT64 io_generic_size(struct io_generic *generic);
void io_generic_close(struct io_generic *genio);
void io_generic_read(struct io_generic *genio, void *buffer, UINT64 offset, size_t length);
void io_generic_write(struct io_generic *genio, const void *buffer, UINT64 offset, size_t length);
void io_generic_write_filler(struct io_generic *genio, UINT8 filler, UINT64 offset, size_t length);
UINT64 io_generic_size(struct io_generic *genio);