[vlc-devel] commit: Fix compilation (thanks to cppcheck developpers to notice this bug) ( Rémi Duraffort )

git version control git at videolan.org
Fri Jun 19 12:56:40 CEST 2009


vlc | branch: 1.0-bugfix | Rémi Duraffort <ivoire at videolan.org> | Fri Jun 19 12:40:35 2009 +0200| [2e511714c846d03169dca8da68d7c773b39dfffd] | committer: Rémi Duraffort 

Fix compilation (thanks to cppcheck developpers to notice this bug)
(cherry picked from commit 17ebc0bf4b35327ba0fcd4ee64d0511ddc72f067)

Signed-off-by: Rémi Duraffort <ivoire at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2e511714c846d03169dca8da68d7c773b39dfffd
---

 modules/access/cdda/access.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/modules/access/cdda/access.c b/modules/access/cdda/access.c
index 90f6735..db3ed3e 100644
--- a/modules/access/cdda/access.c
+++ b/modules/access/cdda/access.c
@@ -318,16 +318,13 @@ static block_t * CDDAReadBlocks( access_t * p_access )
             }
         }
         else
-        {
             rc = cdio_read_audio_sectors( p_cdda->p_cdio, p_block->p_buffer,
                                           p_cdda->i_lsn, i_blocks );
 #else
 #define DRIVER_OP_SUCCESS 0
-            int rc;
-            rc = cdio_read_audio_sectors( p_cdda->p_cdio, p_block->p_buffer,
+        int rc = cdio_read_audio_sectors( p_cdda->p_cdio, p_block->p_buffer,
                                           p_cdda->i_lsn, i_blocks);
 #endif
-        }
         if( rc != DRIVER_OP_SUCCESS )
         {
             msg_Err( p_access, "could not read %d sectors starting from %lu",




More information about the vlc-devel mailing list