X-Git-Url: https://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/06a82a827480c9701487b216a20528d160262118..HEAD:/src/fops.c
diff --git a/src/fops.c b/src/fops.c
index 26b392f..521b50b 100644
--- a/src/fops.c
+++ b/src/fops.c
@@ -1,7 +1,7 @@
/*
* 2ooM: The Master of Orion II Reverse Engineering Project
* Default file operations structures for liblbx.
- * Copyright (C) 2010 Nick Bowler
+ * Copyright © 2010, 2014 Nick Bowler
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,8 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
+#include
#include
#include
+#include
#include "misc.h"
#include "error.h"
@@ -43,11 +45,6 @@ static int file_seek(void *handle, long offset, int whence)
return 0;
}
-static long file_tell(void *handle)
-{
- return ftell((FILE *)handle);
-}
-
static int file_eof(void *handle)
{
return feof((FILE *)handle);
@@ -56,7 +53,6 @@ static int file_eof(void *handle)
const struct lbx_file_ops lbx_default_fops = {
.read = file_read,
.seek = file_seek,
- .tell = file_tell,
.eof = file_eof,
};
@@ -87,6 +83,8 @@ static int pipe_seek(void *handle, long offset, int whence)
case SEEK_END:
distance = -1;
break;
+ default:
+ assert(0);
}
if (distance < 0)
@@ -107,13 +105,6 @@ static int pipe_seek(void *handle, long offset, int whence)
return 0;
}
-static long pipe_tell(void *handle)
-{
- struct lbx_pipe_state *state = handle;
-
- return state->offset;
-}
-
static int pipe_eof(void *handle)
{
struct lbx_pipe_state *state = handle;
@@ -124,7 +115,6 @@ static int pipe_eof(void *handle)
const struct lbx_file_ops lbx_pipe_fops = {
.read = pipe_read,
.seek = pipe_seek,
- .tell = pipe_tell,
.eof = pipe_eof,
};
@@ -138,11 +128,6 @@ static int lbx_seek(void *handle, long offset, int whence)
return lbx_file_seek(handle, offset, whence);
}
-static long lbx_tell(void *handle)
-{
- return lbx_file_tell(handle);
-}
-
static int lbx_eof(void *handle)
{
return lbx_file_eof(handle);
@@ -151,6 +136,5 @@ static int lbx_eof(void *handle)
const struct lbx_file_ops lbx_arch_fops = {
.read = lbx_read,
.seek = lbx_seek,
- .tell = lbx_tell,
.eof = lbx_eof,
};