Merge branch 'master' of git@git.videolan.org:vlc

[vlc] / modules / access / zip / zipaccess.c

diff --git a/modules/access/zip/zipaccess.c b/modules/access/zip/zipaccess.c
index a30e69640cb06aca9d51023b51a5fd030e5eb0c8..3689e12f2445767e8901689dbef983e92bcf3f94 100644 (file)
--- a/modules/access/zip/zipaccess.c
+++ b/modules/access/zip/zipaccess.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * zipaccess.c: Module (access) to extract different archives, based on zlib
  *****************************************************************************
- * Copyright (C) 2007 the VideoLAN team
+ * Copyright (C) 2009 the VideoLAN team
  * $Id$
  *
  * Authors: Jean-Philippe André <jpeg@videolan.org>
@@ -67,7 +67,7 @@ int AccessOpen( vlc_object_t *p_this )
     char *psz_pathToZip = NULL, *psz_path = NULL, *psz_sep = NULL;
 
     p_access->p_sys = p_sys = (access_sys_t*)
-            calloc( sizeof( access_sys_t ), 1 );
+            calloc( 1, sizeof( access_sys_t ) );
     if( !p_sys )
         return VLC_ENOMEM;
 
@@ -155,7 +155,6 @@ void AccessClose( vlc_object_t *p_this )
         free( p_sys->fileFunctions );
         free( p_sys );
     }
-    var_Destroy( p_access, "zip-no-xspf" );
 }
 
 /** **************************************************************************
@@ -164,7 +163,6 @@ void AccessClose( vlc_object_t *p_this )
 static int AccessControl( access_t *p_access, int i_query, va_list args )
 {
     bool         *pb_bool;
-    int          *pi_int;
     int64_t      *pi_64;
 
     switch( i_query )
@@ -182,12 +180,6 @@ static int AccessControl( access_t *p_access, int i_query, va_list args )
             *pb_bool = false;
             break;
 
-        /* */
-        case ACCESS_GET_MTU:
-            pi_int = (int*)va_arg( args, int * );
-            *pi_int = 0;
-            break;
-
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
             *pi_64 = DEFAULT_PTS_DELAY;