summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/formats/ioprocs.cpp
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2016-03-12 12:31:13 +0100
committer ImJezze <jezze@gmx.net>2016-03-12 12:31:13 +0100
commita026a582f1a0ea8c1ede3acaddacef506ef3f3b0 (patch)
treee31573822f2359677de519f9f3b600d98e8764cd /src/lib/formats/ioprocs.cpp
parent477d2abd43984f076b7e45f5527591fa8fd0d241 (diff)
parentdcab55bf53b94713a6f72e9633f5101c8dd6c08c (diff)
Merge pull request #15 from mamedev/master
Sync to base master
Diffstat (limited to 'src/lib/formats/ioprocs.cpp')
-rw-r--r--src/lib/formats/ioprocs.cpp21
1 files changed, 10 insertions, 11 deletions
diff --git a/src/lib/formats/ioprocs.cpp b/src/lib/formats/ioprocs.cpp
index 24f92060a82..9f00e3bb9d5 100644
--- a/src/lib/formats/ioprocs.cpp
+++ b/src/lib/formats/ioprocs.cpp
@@ -68,34 +68,33 @@ const struct io_procs stdio_ioprocs_noclose =
static void corefile_closeproc(void *file)
{
- core_fclose((core_file*)file);
+ delete (util::core_file*)file;
}
static int corefile_seekproc(void *file, INT64 offset, int whence)
{
- return core_fseek((core_file*)file, (long) offset, whence);
+ return ((util::core_file*)file)->seek(offset, whence);
}
static size_t corefile_readproc(void *file, void *buffer, size_t length)
{
- return core_fread((core_file*)file, buffer, length);
+ return ((util::core_file*)file)->read(buffer, length);
}
static size_t corefile_writeproc(void *file, const void *buffer, size_t length)
{
- return core_fwrite((core_file*)file, buffer, length);
+ return ((util::core_file*)file)->write(buffer, length);
}
static UINT64 corefile_filesizeproc(void *file)
{
- long l, sz;
- l = core_ftell((core_file*)file);
- if (core_fseek((core_file*)file, 0, SEEK_END))
- return (size_t) -1;
- sz = core_ftell((core_file*)file);
- if (core_fseek((core_file*)file, l, SEEK_SET))
+ const auto l = ((util::core_file*)file)->tell();
+ if (((util::core_file*)file)->seek(0, SEEK_END))
return (size_t) -1;
- return (size_t) sz;
+ const auto sz = ((util::core_file*)file)->tell();
+ if (((util::core_file*)file)->seek(l, SEEK_SET))
+ return UINT64(-1);
+ return UINT64(sz);
}
const struct io_procs corefile_ioprocs =