[vlc-commits] zip: remove tautology

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Sep  1 21:55:20 2015 +0300| [cbec0abce57590955ec918d655bb92e0270ac163] | committer: Rémi Denis-Courmont

zip: remove tautology

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

 modules/access/zip/zipaccess.c |   20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/modules/access/zip/zipaccess.c b/modules/access/zip/zipaccess.c
index 2f2b4dc..6834528 100644
--- a/modules/access/zip/zipaccess.c
+++ b/modules/access/zip/zipaccess.c
@@ -201,18 +201,16 @@ void AccessClose( vlc_object_t *p_this )
 {
     access_t     *p_access = (access_t*)p_this;
     access_sys_t *p_sys = p_access->p_sys;
-    if( p_sys )
+    unzFile file = p_sys->zipFile;
+
+    if( file )
     {
-        unzFile file = p_sys->zipFile;
-        if( file )
-        {
-            unzCloseCurrentFile( file );
-            unzClose( file );
-        }
-        free( p_sys->psz_fileInzip );
-        free( p_sys->fileFunctions );
-        free( p_sys );
+        unzCloseCurrentFile( file );
+        unzClose( file );
     }
+    free( p_sys->psz_fileInzip );
+    free( p_sys->fileFunctions );
+    free( p_sys );
 }
 
 /** **************************************************************************
@@ -270,7 +268,6 @@ static int AccessControl( access_t *p_access, int i_query, va_list args )
 static ssize_t AccessRead( access_t *p_access, uint8_t *p_buffer, size_t sz )
 {
     access_sys_t *p_sys = p_access->p_sys;
-    assert( p_sys );
     unzFile file = p_sys->zipFile;
     if( !file )
     {
@@ -291,7 +288,6 @@ static ssize_t AccessRead( access_t *p_access, uint8_t *p_buffer, size_t sz )
 static int AccessSeek( access_t *p_access, uint64_t seek_len )
 {
     access_sys_t *p_sys = p_access->p_sys;
-    assert( p_sys );
     unzFile file = p_sys->zipFile;
 
     if( !file )