[fuse-emulator-cvs] SF.net SVN: fuse-emulator:[4548] trunk/libspectrum

[<pa...@us...>]

Revision: 4548
          http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4548&view=rev
Author:   pak21
Date:     2011-11-06 21:44:48 +0000 (Sun, 06 Nov 2011)
Log Message:
-----------
The "look, Phil's not dead" commit.

Remove unused variables (thanks, gcc 4.6).

Modified Paths:
--------------
    trunk/libspectrum/hacking/ChangeLog
    trunk/libspectrum/rzx.c
    trunk/libspectrum/szx.c

Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog	2011-09-27 11:50:15 UTC (rev 4547)
+++ trunk/libspectrum/hacking/ChangeLog	2011-11-06 21:44:48 UTC (rev 4548)
@@ -856,3 +856,4 @@
          uninitialised pointers in libspectrum_make_room, at stopping RZX
          recordings or saving snapshots (part of patch #3404090) (Sergio
          Baldoví).
+20111106 rzx.c,szx.c: remove unused variables (thanks, gcc 4.6).

Modified: trunk/libspectrum/rzx.c
===================================================================
--- trunk/libspectrum/rzx.c	2011-09-27 11:50:15 UTC (rev 4547)
+++ trunk/libspectrum/rzx.c	2011-11-06 21:44:48 UTC (rev 4548)
@@ -766,8 +766,6 @@
 static libspectrum_error
 rzx_read_header( const libspectrum_byte **ptr, const libspectrum_byte *end )
 {
-  libspectrum_dword flags;
-
   /* Check the header exists */
   if( end - (*ptr) < (ptrdiff_t)strlen( rzx_signature ) + 6 ) {
     libspectrum_print_error( LIBSPECTRUM_ERROR_CORRUPT,
@@ -785,7 +783,9 @@
   /* Skip over the signature and the version numbers */
   (*ptr) += strlen( rzx_signature ) + 2;
 
-  flags = libspectrum_read_dword( ptr );
+  /* And skip the flags as well - separate call as we'll need the return
+     value if we ever fix the stuff below */
+  libspectrum_read_dword( ptr );
 
   /* FIXME: how to handle signatures */
 

Modified: trunk/libspectrum/szx.c
===================================================================
--- trunk/libspectrum/szx.c	2011-09-27 11:50:15 UTC (rev 4547)
+++ trunk/libspectrum/szx.c	2011-11-06 21:44:48 UTC (rev 4548)
@@ -1700,7 +1700,6 @@
 
   libspectrum_byte *buffer2;
 
-  size_t compressed_length;
   size_t uncompressed_length;
 
   libspectrum_error error;
@@ -1713,7 +1712,8 @@
     return LIBSPECTRUM_ERROR_UNKNOWN;
   }
 
-  compressed_length = libspectrum_read_dword( buffer );
+  /* Skip the compressed length as we never actually use it - bug? */
+  libspectrum_read_dword( buffer );
 
   uncompressed_length = 0x4000;
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.