[vlc-commits] Lua: remove unused parameter

Rémi Denis-Courmont git at videolan.org
Tue Mar 27 18:21:14 CEST 2012


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Mar 27 19:20:51 2012 +0300| [735b12358b8efd59484013b4f69a287864080c38] | committer: Rémi Denis-Courmont

Lua: remove unused parameter

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

 modules/lua/libs/configuration.c |    2 +-
 modules/lua/vlc.c                |   11 +++++------
 modules/lua/vlc.h                |    2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/modules/lua/libs/configuration.c b/modules/lua/libs/configuration.c
index a640c3e..b5a5cbd 100644
--- a/modules/lua/libs/configuration.c
+++ b/modules/lua/libs/configuration.c
@@ -151,7 +151,7 @@ static int vlclua_datadir_list( lua_State *L )
     char **ppsz_dir_list = NULL;
     int i = 1;
 
-    if( vlclua_dir_list( vlclua_get_this( L ), psz_dirname, &ppsz_dir_list )
+    if( vlclua_dir_list( psz_dirname, &ppsz_dir_list )
         != VLC_SUCCESS )
         return 0;
     lua_newtable( L );
diff --git a/modules/lua/vlc.c b/modules/lua/vlc.c
index b6d2a1d..8ac0466 100644
--- a/modules/lua/vlc.c
+++ b/modules/lua/vlc.c
@@ -194,8 +194,7 @@ static int file_compare( const char **a, const char **b )
     return strcmp( *a, *b );
 }
 
-int vlclua_dir_list( vlc_object_t *p_this, const char *luadirname,
-                     char ***pppsz_dir_list )
+int vlclua_dir_list( const char *luadirname, char ***pppsz_dir_list )
 {
 #define MAX_DIR_LIST_SIZE 5
     *pppsz_dir_list = malloc(MAX_DIR_LIST_SIZE*sizeof(char *));
@@ -265,7 +264,7 @@ int vlclua_scripts_batch_execute( vlc_object_t *p_this,
     char **ppsz_dir_list = NULL;
     int i_ret;
 
-    if( (i_ret = vlclua_dir_list( p_this, luadirname, &ppsz_dir_list )) != VLC_SUCCESS)
+    if( (i_ret = vlclua_dir_list( luadirname, &ppsz_dir_list )) != VLC_SUCCESS)
         return i_ret;
 
     i_ret = VLC_EGENERIC;
@@ -316,7 +315,7 @@ int vlclua_scripts_batch_execute( vlc_object_t *p_this,
 char *vlclua_find_file( vlc_object_t *p_this, const char *psz_luadirname, const char *psz_name )
 {
     char **ppsz_dir_list = NULL;
-    vlclua_dir_list( p_this, psz_luadirname, &ppsz_dir_list );
+    vlclua_dir_list( psz_luadirname, &ppsz_dir_list );
 
     for( char **ppsz_dir = ppsz_dir_list; *ppsz_dir; ppsz_dir++ )
     {
@@ -602,7 +601,7 @@ static int vlc_sd_probe_Open( vlc_object_t *obj )
     char **ppsz_dir_list = NULL;
     char **ppsz_dir;
     lua_State *L = NULL;
-    vlclua_dir_list( obj, "sd", &ppsz_dir_list );
+    vlclua_dir_list( "sd", &ppsz_dir_list );
     for( ppsz_dir = ppsz_dir_list; *ppsz_dir; ppsz_dir++ )
     {
         int i_files;
@@ -774,7 +773,7 @@ int vlclua_add_modules_path( vlc_object_t *obj, lua_State *L, const char *psz_fi
     count += vlclua_add_modules_path_inner( L, psz_path );
 
     char **ppsz_dir_list = NULL;
-    vlclua_dir_list( obj, psz_char+1/* gruik? */, &ppsz_dir_list );
+    vlclua_dir_list( psz_char+1/* gruik? */, &ppsz_dir_list );
     char **ppsz_dir = ppsz_dir_list;
 
     for( ; *ppsz_dir && strcmp( *ppsz_dir, psz_path ); ppsz_dir++ );
diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h
index 052b7af..7625735 100644
--- a/modules/lua/vlc.h
+++ b/modules/lua/vlc.h
@@ -129,7 +129,7 @@ int vlclua_push_ret( lua_State *, int i_error );
 int vlclua_scripts_batch_execute( vlc_object_t *p_this, const char * luadirname,
         int (*func)(vlc_object_t *, const char *, void *),
         void * user_data );
-int vlclua_dir_list( vlc_object_t *p_this, const char *luadirname, char ***pppsz_dir_list );
+int vlclua_dir_list( const char *luadirname, char ***pppsz_dir_list );
 void vlclua_dir_list_free( char **ppsz_dir_list );
 char *vlclua_find_file( vlc_object_t *p_this, const char *psz_luadirname, const char *psz_name );
 



More information about the vlc-commits mailing list