[vlc-commits] stream: remove tautology

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Aug 25 21:07:32 2014 +0300| [5001b70bc13d9bf71d8b86a9e4a5f7aeb716de72] | committer: Rémi Denis-Courmont

stream: remove tautology

p_current cannot be NULL.

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

 src/input/stream.c |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/input/stream.c b/src/input/stream.c
index 42cd823..ba7bcee 100644
--- a/src/input/stream.c
+++ b/src/input/stream.c
@@ -776,16 +776,13 @@ static int AStreamReadBlock( stream_t *s, void *p_read, unsigned int i_read )
         if( p_sys->block.i_offset >= p_sys->block.p_current->i_buffer )
         {
             /* Current block is now empty, switch to next */
-            if( p_sys->block.p_current )
-            {
-                p_sys->block.i_offset = 0;
-                p_sys->block.p_current = p_sys->block.p_current->p_next;
-            }
+            p_sys->block.i_offset = 0;
+            p_sys->block.p_current = p_sys->block.p_current->p_next;
+
             /*Get a new block if needed */
             if( !p_sys->block.p_current && AStreamRefillBlock( s ) )
-            {
                 break;
-            }
+            assert( p_sys->block.p_current );
         }
     }