From 540d82b411c8e2a03c54c06c2f6dc37e9188a0c1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Sat, 23 Jan 2010 21:36:11 +0200
Subject: [PATCH] Remove the old module config lock

---
 include/vlc_configuration.h | 1 -
 src/modules/cache.c         | 2 --
 src/modules/entry.c         | 3 ---
 src/modules/modules.h       | 1 -
 4 files changed, 7 deletions(-)

diff --git a/include/vlc_configuration.h b/include/vlc_configuration.h
index 2c7345e963..dbe3280cfd 100644
--- a/include/vlc_configuration.h
+++ b/include/vlc_configuration.h
@@ -178,7 +178,6 @@ struct module_config_t
     int            i_action;                           /* actions list size */
 
     /* Misc */
-    vlc_mutex_t *p_lock;           /* Lock to use when modifying the config */
     bool        b_dirty;          /* Dirty flag to indicate a config change */
     bool        b_advanced;          /* Flag to indicate an advanced option */
     bool        b_internal;   /* Flag to indicate option is not to be shown */
diff --git a/src/modules/cache.c b/src/modules/cache.c
index 9a3fb36b25..46389f63bf 100644
--- a/src/modules/cache.c
+++ b/src/modules/cache.c
@@ -392,8 +392,6 @@ static int CacheLoadConfig( module_t *p_module, FILE *file )
 
         p_module->p_config[i].b_dirty = false;
 
-        p_module->p_config[i].p_lock = &p_module->lock;
-
         if( p_module->p_config[i].i_list )
         {
             if( p_module->p_config[i].ppsz_list )
diff --git a/src/modules/entry.c b/src/modules/entry.c
index 1b5dba6f4f..de6312f07b 100644
--- a/src/modules/entry.c
+++ b/src/modules/entry.c
@@ -37,7 +37,6 @@ static void vlc_module_destruct (gc_object_t *obj)
 {
     module_t *module = vlc_priv (obj, module_t);
 
-    vlc_mutex_destroy (&module->lock);
     free (module->psz_object_name);
     free (module);
 }
@@ -56,7 +55,6 @@ module_t *vlc_module_create (vlc_object_t *obj)
     module->parent = NULL;
     module->submodule_count = 0;
     vlc_gc_init (module, vlc_module_destruct);
-    vlc_mutex_init (&module->lock);
 
     module->psz_shortname = NULL;
     module->psz_longname = (char*)default_name;
@@ -135,7 +133,6 @@ static module_config_t *vlc_config_create (module_t *module, int type)
 
     memset (tab + confsize, 0, sizeof (tab[confsize]));
     tab[confsize].i_type = type;
-    tab[confsize].p_lock = &module->lock;
 
     if (type & CONFIG_ITEM)
     {
diff --git a/src/modules/modules.h b/src/modules/modules.h
index c4a5eeebd7..6d79ba9186 100644
--- a/src/modules/modules.h
+++ b/src/modules/modules.h
@@ -102,7 +102,6 @@ struct module_t
     module_t   *parent;
     unsigned    submodule_count;
     gc_object_t vlc_gc_data;
-    vlc_mutex_t lock;
 
     /*
      * Variables set by the module to identify itself
-- 
2.39.5