[vlc-commits] lua: remove unused argument

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Mar 24 18:30:11 2013 +0200| [c61fe43abfcdc4b052625c61c0a12f512571e6ec] | committer: Rémi Denis-Courmont

lua: remove unused argument

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

 modules/lua/demux.c              |    2 +-
 modules/lua/extension.c          |    2 +-
 modules/lua/intf.c               |    2 +-
 modules/lua/meta.c               |    2 +-
 modules/lua/services_discovery.c |    2 +-
 modules/lua/vlc.c                |    5 ++---
 modules/lua/vlc.h                |    3 +--
 7 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/modules/lua/demux.c b/modules/lua/demux.c
index 7bb6661..a84fd66 100644
--- a/modules/lua/demux.c
+++ b/modules/lua/demux.c
@@ -161,7 +161,7 @@ static int probe_luascript( vlc_object_t *p_this, const char * psz_filename,
     lua_pop( L, 1 );
 
     /* Setup the module search path */
-    if( vlclua_add_modules_path( p_demux, L, psz_filename ) )
+    if( vlclua_add_modules_path( L, psz_filename ) )
     {
         msg_Warn( p_demux, "Error while setting the module search path for %s",
                   psz_filename );
diff --git a/modules/lua/extension.c b/modules/lua/extension.c
index d1434db..e408db6 100644
--- a/modules/lua/extension.c
+++ b/modules/lua/extension.c
@@ -852,7 +852,7 @@ static lua_State* GetLuaState( extensions_manager_t *p_mgr,
             }
             else
             {
-                if( vlclua_add_modules_path( p_mgr, L, p_ext->psz_name ) )
+                if( vlclua_add_modules_path( L, p_ext->psz_name ) )
                 {
                     msg_Warn( p_mgr, "Error while setting the module "
                               "search path for %s", p_ext->psz_name );
diff --git a/modules/lua/intf.c b/modules/lua/intf.c
index b66a612..6e4eeef 100644
--- a/modules/lua/intf.c
+++ b/modules/lua/intf.c
@@ -274,7 +274,7 @@ static int Start_LuaIntf( vlc_object_t *p_this, const char *name )
     lua_pop( L, 1 );
 
     /* Setup the module search path */
-    if( vlclua_add_modules_path( p_intf, L, p_sys->psz_filename ) )
+    if( vlclua_add_modules_path( L, p_sys->psz_filename ) )
     {
         msg_Warn( p_intf, "Error while setting the module search path for %s",
                   p_sys->psz_filename );
diff --git a/modules/lua/meta.c b/modules/lua/meta.c
index 824dd86..a0c40d1 100644
--- a/modules/lua/meta.c
+++ b/modules/lua/meta.c
@@ -74,7 +74,7 @@ static lua_State * init( vlc_object_t *p_this, input_item_t * p_item, const char
     luaopen_xml( L );
     luaopen_input_item( L, p_item );
 
-    if( vlclua_add_modules_path( p_this, L, psz_filename ) )
+    if( vlclua_add_modules_path( L, psz_filename ) )
     {
         msg_Warn( p_this, "Error while setting the module search path for %s",
                   psz_filename );
diff --git a/modules/lua/services_discovery.c b/modules/lua/services_discovery.c
index f9425e0..d7049c7 100644
--- a/modules/lua/services_discovery.c
+++ b/modules/lua/services_discovery.c
@@ -120,7 +120,7 @@ int Open_LuaSD( vlc_object_t *p_this )
     luaopen_xml( L );
     lua_pop( L, 1 );
 
-    if( vlclua_add_modules_path( p_sd, L, p_sys->psz_filename ) )
+    if( vlclua_add_modules_path( L, p_sys->psz_filename ) )
     {
         msg_Warn( p_sd, "Error while setting the module search path for %s",
                   p_sys->psz_filename );
diff --git a/modules/lua/vlc.c b/modules/lua/vlc.c
index 0c43e07..06c48e0 100644
--- a/modules/lua/vlc.c
+++ b/modules/lua/vlc.c
@@ -637,7 +637,7 @@ static int vlc_sd_probe_Open( vlc_object_t *obj )
                 goto error;
             }
             luaL_openlibs( L );
-            if( vlclua_add_modules_path( probe, L, psz_filename ) )
+            if( vlclua_add_modules_path( L, psz_filename ) )
             {
                 msg_Err( probe, "Error while setting the module search path for %s",
                           psz_filename );
@@ -736,8 +736,7 @@ static int vlclua_add_modules_path_inner( lua_State *L, const char *psz_path )
     return count;
 }
 
-#undef vlclua_add_modules_path
-int vlclua_add_modules_path( vlc_object_t *obj, lua_State *L, const char *psz_filename )
+int vlclua_add_modules_path( lua_State *L, const char *psz_filename )
 {
     /* Setup the module search path:
      *   * "The script's directory"/modules
diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h
index 7625735..fbd2915 100644
--- a/modules/lua/vlc.h
+++ b/modules/lua/vlc.h
@@ -152,8 +152,7 @@ int vlclua_playlist_add_internal( vlc_object_t *, lua_State *, playlist_t *,
                                   input_item_t *, bool );
 #define vlclua_playlist_add_internal( a, b, c, d, e ) vlclua_playlist_add_internal( VLC_OBJECT( a ), b, c, d, e )
 
-int vlclua_add_modules_path( vlc_object_t *, lua_State *, const char *psz_filename );
-#define vlclua_add_modules_path( a, b, c ) vlclua_add_modules_path( VLC_OBJECT( a ), b, c )
+int vlclua_add_modules_path( lua_State *, const char *psz_filename );
 
 /**
  * Per-interface private state