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

[<sba...@us...>]

Revision: 5112
          http://sourceforge.net/p/fuse-emulator/code/5112
Author:   sbaldovi
Date:     2015-01-07 21:29:18 +0000 (Wed, 07 Jan 2015)
Log Message:
-----------
Rewrite some conditions for RZX finalisation in a more logical way.

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

Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog	2015-01-07 21:17:59 UTC (rev 5111)
+++ trunk/libspectrum/hacking/ChangeLog	2015-01-07 21:29:18 UTC (rev 5112)
@@ -965,3 +965,5 @@
 20141230 szx.c: guard against passing a NULL pointer to memcpy in
          write_if1_chunk() (thanks, clang static analyser) (Fred).
 20141230 autogen.sh: select glibtoolize where required (Sergio via fuse).
+20150107 rzx.c: rewrite some conditions for RZX finalisation in a more logical
+         way (thanks, clang static analyser) (Sergio).

Modified: trunk/libspectrum/rzx.c
===================================================================
--- trunk/libspectrum/rzx.c	2015-01-07 21:17:59 UTC (rev 5111)
+++ trunk/libspectrum/rzx.c	2015-01-07 21:29:18 UTC (rev 5112)
@@ -1781,9 +1781,11 @@
     if( block->type == LIBSPECTRUM_RZX_INPUT_BLOCK ) {
 
       next_item = list->next;
-      next_block = ( next_item )? next_item->data : NULL;
+      if( !next_item ) break;
 
-      if( next_block && next_block->type == LIBSPECTRUM_RZX_INPUT_BLOCK ) {
+      next_block = next_item->data;
+
+      if( next_block->type == LIBSPECTRUM_RZX_INPUT_BLOCK ) {
         error = input_block_merge( &( block->types.input ),
                                    &( next_block->types.input ) );
         if( error ) return error;

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