Tiny code factorization

diff --git a/src/modules/entry.c b/src/modules/entry.c
index 8dff09a549d3d272ac3ce5e213bdfcbb1aaac410..c0ae15bfa7a5ed2d56f73de2291ef838b45dffa4 100644 (file)
--- a/src/modules/entry.c
+++ b/src/modules/entry.c
@@ -32,20 +32,12 @@ module_t *vlc_module_create (vlc_object_t *obj)
 #ifndef HAVE_SHARED_LIBVLC
     module->p_symbols = &obj->p_libvlc_global->p_module_bank->symbols;
 #endif
-    module->b_loaded = module->b_submodule = VLC_FALSE;
     module->b_reentrant = module->b_unloadable = VLC_TRUE;
     module->psz_object_name = module->psz_longname = default_name;
-    module->psz_help = module->psz_shortname = NULL;
     module->pp_shortcuts[0] = default_name;
-    for (unsigned i = 1; i < MODULE_SHORTCUT_MAX; i++)
-         module->pp_shortcuts[i] = NULL;
-
     module->i_cpu = 0;
-    module->psz_program = NULL;
     module->psz_capability = "";
     module->i_score = 1;
-    module->pf_activate = NULL;
-    module->pf_deactivate = NULL;
     return module;
 }
 
@@ -74,8 +66,6 @@ module_t *vlc_submodule_create (module_t *module)
     submodule->psz_capability = module->psz_capability;
     submodule->i_score = module->i_score;
     submodule->i_cpu = module->i_cpu;
-    submodule->pf_activate = NULL;
-    submodule->pf_deactivate = NULL;
     return submodule;
 }
 

diff --git a/src/modules/modules.c b/src/modules/modules.c
index 3611b7d04492f7ed1e9fe3aca4a3f4677dfc9554..54c7f8db9b46deecae6dbe657eec9a0157e50c50 100644 (file)
--- a/src/modules/modules.c
+++ b/src/modules/modules.c
@@ -1231,7 +1231,7 @@ static int AllocateBuiltinModule( vlc_object_t * p_this,
 
     /* Now that we have successfully loaded the module, we can
      * allocate a structure for it */
-    p_module = vlc_object_create( p_this, VLC_OBJECT_MODULE );
+    p_module = vlc_module_create( p_this );
     if( p_module == NULL )
     {
         msg_Err( p_this, "out of memory" );
@@ -1785,7 +1785,7 @@ static void CacheLoad( vlc_object_t *p_this )
 
         if( pp_cache[i]->b_junk ) continue;
 
-        pp_cache[i]->p_module = vlc_object_create( p_this, VLC_OBJECT_MODULE );
+        pp_cache[i]->p_module = vlc_module_create( p_this );
 
         /* Load additional infos */
         LOAD_STRING( pp_cache[i]->p_module->psz_object_name );
@@ -1814,10 +1814,7 @@ static void CacheLoad( vlc_object_t *p_this )
 
         while( i_submodules-- )
         {
-            module_t *p_module = vlc_object_create( p_this, VLC_OBJECT_MODULE);
-            vlc_object_attach( p_module, pp_cache[i]->p_module );
-            p_module->b_submodule = VLC_TRUE;
-
+            module_t *p_module = vlc_submodule_create( pp_cache[i]->p_module );
             LOAD_STRING( p_module->psz_object_name );
             LOAD_STRING( p_module->psz_shortname );
             LOAD_STRING( p_module->psz_longname );