From: <sba...@us...> - 2012-11-29 19:10:01
|
Revision: 4780 http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4780&view=rev Author: sbaldovi Date: 2012-11-29 19:09:52 +0000 (Thu, 29 Nov 2012) Log Message: ----------- Remove unused variables when not linking against external libraries (Sergio). Modified Paths: -------------- trunk/libspectrum/csw.c trunk/libspectrum/hacking/ChangeLog trunk/libspectrum/rzx.c trunk/libspectrum/szx.c Modified: trunk/libspectrum/csw.c =================================================================== --- trunk/libspectrum/csw.c 2012-11-29 18:55:54 UTC (rev 4779) +++ trunk/libspectrum/csw.c 2012-11-29 19:09:52 UTC (rev 4780) @@ -39,7 +39,6 @@ { libspectrum_tape_block *block = NULL; libspectrum_tape_rle_pulse_block *csw_block; - libspectrum_error error; int compressed; @@ -112,6 +111,8 @@ if( compressed ) { /* Compressed data... */ #ifdef HAVE_ZLIB_H + libspectrum_error error; + csw_block->data = NULL; csw_block->length = 0; error = libspectrum_zlib_inflate( buffer, length, &csw_block->data, Modified: trunk/libspectrum/hacking/ChangeLog =================================================================== --- trunk/libspectrum/hacking/ChangeLog 2012-11-29 18:55:54 UTC (rev 4779) +++ trunk/libspectrum/hacking/ChangeLog 2012-11-29 19:09:52 UTC (rev 4780) @@ -905,3 +905,5 @@ 20121129 configure.ac: don't check for windres when not building for Windows hosts. Remove --without-windres option, previously used as a workaround (Sergio). +20121129 csw.c,rzx.c,szx.c: remove unused variables when not linking against + external libraries (Sergio). Modified: trunk/libspectrum/rzx.c =================================================================== --- trunk/libspectrum/rzx.c 2012-11-29 18:55:54 UTC (rev 4779) +++ trunk/libspectrum/rzx.c 2012-11-29 19:09:52 UTC (rev 4780) @@ -194,7 +194,9 @@ { size_t i; input_block_t *input; +#ifdef HAVE_GCRYPT_H signature_block_t *signature; +#endif /* #ifdef HAVE_GCRYPT_H */ switch( block->type ) { @@ -216,9 +218,8 @@ return LIBSPECTRUM_ERROR_NONE; case LIBSPECTRUM_RZX_SIGN_END_BLOCK: +#ifdef HAVE_GCRYPT_H signature = &( block->types.signature ); - -#ifdef HAVE_GCRYPT_H gcry_mpi_release( signature->r ); gcry_mpi_release( signature->s ); #endif /* #ifdef HAVE_GCRYPT_H */ @@ -1448,7 +1449,6 @@ rzx_write_input( input_block_t *block, libspectrum_byte **buffer, libspectrum_byte **ptr, size_t *length, int compress ) { - libspectrum_error error; size_t i, size; size_t length_offset, data_offset, flags_offset; libspectrum_byte *length_ptr; @@ -1512,6 +1512,7 @@ /* Compress the data the simple way. Really, we should stream the data */ libspectrum_byte *gzsnap = NULL; size_t gzlength; libspectrum_byte *data_ptr = *buffer + data_offset; + libspectrum_error error; error = libspectrum_zlib_compress( data_ptr, *ptr - data_ptr, &gzsnap, &gzlength ); Modified: trunk/libspectrum/szx.c =================================================================== --- trunk/libspectrum/szx.c 2012-11-29 18:55:54 UTC (rev 4779) +++ trunk/libspectrum/szx.c 2012-11-29 19:09:52 UTC (rev 4780) @@ -1914,9 +1914,8 @@ int compressed, size_t *data_remaining, void (*setter)(libspectrum_snap*, int, libspectrum_byte*) ) { - size_t data_length, uncompressed_length = 0; - libspectrum_error error; - libspectrum_byte *data_out, *uncompressed_data; + size_t data_length; + libspectrum_byte *data_out; const libspectrum_byte *data; if( *data_remaining < 4 ) { @@ -1938,6 +1937,9 @@ if( compressed ) { #ifdef HAVE_ZLIB_H + libspectrum_error error; + size_t uncompressed_length = 0; + libspectrum_byte *uncompressed_data; error = libspectrum_zlib_inflate( *buffer, data_length, &uncompressed_data, &uncompressed_length ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |