[vlc-commits] Remove unused module bank parameters
Rémi Denis-Courmont
git at videolan.org
Mon Aug 15 21:27:12 CEST 2011
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Aug 15 22:16:51 2011 +0300| [d26bac398f1ae57bb807ea9f02924373b386445c] | committer: Rémi Denis-Courmont
Remove unused module bank parameters
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d26bac398f1ae57bb807ea9f02924373b386445c
---
src/libvlc.c | 14 +++++++-------
src/modules/modules.c | 10 ++--------
src/modules/modules.h | 6 ++----
3 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/src/libvlc.c b/src/libvlc.c
index 7832d53..8acc696 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -279,11 +279,11 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
* main module. We need to do this at this stage to be able to display
* a short help if required by the user. (short help == main module
* options) */
- module_InitBank( p_libvlc );
+ module_InitBank ();
if( config_LoadCmdLine( p_libvlc, i_argc, ppsz_argv, NULL ) )
{
- module_EndBank( p_libvlc, false );
+ module_EndBank (false);
return VLC_EGENERIC;
}
@@ -378,7 +378,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
if( b_exit )
{
- module_EndBank( p_libvlc, false );
+ module_EndBank (false);
return i_ret;
}
@@ -470,7 +470,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
if( b_exit )
{
- module_EndBank( p_libvlc, true );
+ module_EndBank (true);
return i_ret;
}
@@ -501,7 +501,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
"that they are valid.\n" );
PauseConsole();
#endif
- module_EndBank( p_libvlc, true );
+ module_EndBank (true);
return VLC_EGENERIC;
}
priv->i_verbose = var_InheritInteger( p_libvlc, "verbose" );
@@ -800,7 +800,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
{
module_unneed( p_libvlc, priv->p_memcpy_module );
}
- module_EndBank( p_libvlc, true );
+ module_EndBank (true);
return VLC_EGENERIC;
}
@@ -1047,7 +1047,7 @@ void libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
config_AutoSaveConfigFile( VLC_OBJECT(p_libvlc) );
/* Free module bank. It is refcounted, so we call this each time */
- module_EndBank( p_libvlc, true );
+ module_EndBank (true);
vlc_DeinitActions( p_libvlc, priv->actions );
}
diff --git a/src/modules/modules.c b/src/modules/modules.c
index 2d52afd..915b5d7 100644
--- a/src/modules/modules.c
+++ b/src/modules/modules.c
@@ -85,16 +85,13 @@ static module_t * AllocatePlugin( vlc_object_t *, const char *, bool );
static module_t *module_InitStatic (vlc_plugin_cb);
static void DeleteModule (module_t **, module_t *);
-#undef module_InitBank
/**
* Init bank
*
* Creates a module bank structure which will be filled later
* on with all the modules found.
- * \param p_this vlc object structure
- * \return nothing
*/
-void module_InitBank( vlc_object_t *p_this )
+void module_InitBank (void)
{
vlc_mutex_lock (&modules.lock);
@@ -121,14 +118,11 @@ void module_InitBank( vlc_object_t *p_this )
/*vlc_mutex_unlock (&modules.lock);*/
}
-#undef module_EndBank
/**
* Unloads all unused plugin modules and empties the module
* bank in case of success.
- * \param p_this vlc object structure
- * \return nothing
*/
-void module_EndBank( vlc_object_t *p_this, bool b_plugins )
+void module_EndBank (bool b_plugins)
{
module_t *head = NULL;
diff --git a/src/modules/modules.h b/src/modules/modules.h
index 6418b67..f1ba751 100644
--- a/src/modules/modules.h
+++ b/src/modules/modules.h
@@ -112,12 +112,10 @@ module_t *vlc_module_create (void);
module_t *vlc_submodule_create (module_t *module);
void vlc_module_destroy (module_t *);
-void module_InitBank( vlc_object_t * );
-#define module_InitBank(a) module_InitBank(VLC_OBJECT(a))
+void module_InitBank (void);
void module_LoadPlugins( vlc_object_t * );
#define module_LoadPlugins(a) module_LoadPlugins(VLC_OBJECT(a))
-void module_EndBank( vlc_object_t *, bool );
-#define module_EndBank(a,b) module_EndBank(VLC_OBJECT(a), b)
+void module_EndBank (bool);
int vlc_bindtextdomain (const char *);
More information about the vlc-commits
mailing list