summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib
diff options
context:
space:
mode:
author R. Belmont <rb6502@users.noreply.github.com>2011-05-30 02:30:20 +0000
committer R. Belmont <rb6502@users.noreply.github.com>2011-05-30 02:30:20 +0000
commit9bb0a24eb1daa40920f1b6387a346b045fd9b7a8 (patch)
treea432644c9a13fc6b8f2c16a4723036b4c8ad392d /src/lib
parent1a23f8659bd9d8537f9a824769853c81f83f852e (diff)
GCC 4.6 "variable assigned but not used" fixes, part 1 (no whatsnew)
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/util/aviio.c8
-rw-r--r--src/lib/util/corefile.c8
2 files changed, 7 insertions, 9 deletions
diff --git a/src/lib/util/aviio.c b/src/lib/util/aviio.c
index 888aabce480..28ed4aab9cf 100644
--- a/src/lib/util/aviio.c
+++ b/src/lib/util/aviio.c
@@ -1513,10 +1513,10 @@ error:
static avi_error parse_indx_chunk(avi_file *file, avi_stream *stream, avi_chunk *strf)
{
- UINT32 entries, entry, id;
+ UINT32 entries, entry;
UINT8 *chunkdata = NULL;
UINT16 longs_per_entry;
- UINT8 subtype, type;
+ UINT8 type;
UINT64 baseoffset;
avi_error avierr;
@@ -1527,10 +1527,10 @@ static avi_error parse_indx_chunk(avi_file *file, avi_stream *stream, avi_chunk
/* extract the data */
longs_per_entry = fetch_16bits(&chunkdata[0]);
- subtype = chunkdata[2];
+ //subtype = chunkdata[2];
type = chunkdata[3];
entries = fetch_32bits(&chunkdata[4]);
- id = fetch_32bits(&chunkdata[8]);
+ //id = fetch_32bits(&chunkdata[8]);
baseoffset = fetch_64bits(&chunkdata[12]);
/* if this is a superindex, loop over entries and call ourselves recursively */
diff --git a/src/lib/util/corefile.c b/src/lib/util/corefile.c
index 26dfe12f6e0..94c8d49a4a6 100644
--- a/src/lib/util/corefile.c
+++ b/src/lib/util/corefile.c
@@ -435,7 +435,6 @@ UINT64 core_fsize(core_file *file)
UINT32 core_fread(core_file *file, void *buffer, UINT32 length)
{
- file_error filerr;
UINT32 bytes_read = 0;
/* flush any buffered char */
@@ -457,7 +456,7 @@ UINT32 core_fread(core_file *file, void *buffer, UINT32 length)
/* read as much as makes sense into the buffer */
file->bufferbase = file->offset + bytes_read;
file->bufferbytes = 0;
- filerr = osd_or_zlib_read(file, file->buffer, file->bufferbase, sizeof(file->buffer), &file->bufferbytes);
+ osd_or_zlib_read(file, file->buffer, file->bufferbase, sizeof(file->buffer), &file->bufferbytes);
/* do a bounded copy from the buffer to the destination */
bytes_read += safe_buffer_copy(file->buffer, 0, file->bufferbytes, buffer, bytes_read, length);
@@ -467,7 +466,7 @@ UINT32 core_fread(core_file *file, void *buffer, UINT32 length)
else
{
UINT32 new_bytes_read = 0;
- filerr = osd_or_zlib_read(file, (UINT8 *)buffer + bytes_read, file->offset + bytes_read, length - bytes_read, &new_bytes_read);
+ osd_or_zlib_read(file, (UINT8 *)buffer + bytes_read, file->offset + bytes_read, length - bytes_read, &new_bytes_read);
bytes_read += new_bytes_read;
}
}
@@ -771,7 +770,6 @@ file_error core_fload(const char *filename, void **data, UINT32 *length)
UINT32 core_fwrite(core_file *file, const void *buffer, UINT32 length)
{
UINT32 bytes_written = 0;
- file_error filerr;
/* can't write to RAM-based stuff */
if (file->data != NULL)
@@ -785,7 +783,7 @@ UINT32 core_fwrite(core_file *file, const void *buffer, UINT32 length)
file->bufferbytes = 0;
/* do the write */
- filerr = osd_or_zlib_write(file, buffer, file->offset, length, &bytes_written);
+ osd_or_zlib_write(file, buffer, file->offset, length, &bytes_written);
/* return the number of bytes read */
file->offset += bytes_written;