[vlc-commits] Do not store help for submodules in cache

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Aug 15 19:23:32 2011 +0300| [c5b49937f0cf958f179e8d1767c88b9dcb251003] | committer: Rémi Denis-Courmont

Do not store help for submodules in cache

This field is never used for submodules, and in fact there would be no
way to show it in the (current) UI.

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

 src/modules/cache.c |    2 --
 src/modules/entry.c |    2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/cache.c b/src/modules/cache.c
index d903f75..781923c 100644
--- a/src/modules/cache.c
+++ b/src/modules/cache.c
@@ -237,7 +237,6 @@ size_t CacheLoad( vlc_object_t *p_this, const char *dir, module_cache_t **r )
             free (submodule->pp_shortcuts);
             LOAD_STRING(submodule->psz_shortname);
             LOAD_STRING(submodule->psz_longname);
-            LOAD_STRING(submodule->psz_help);
 
             LOAD_IMMEDIATE(submodule->i_shortcuts);
             if (submodule->i_shortcuts > MODULE_SHORTCUT_MAX)
@@ -535,7 +534,6 @@ static int CacheSaveSubmodule( FILE *file, const module_t *p_module )
 
     SAVE_STRING( p_module->psz_shortname );
     SAVE_STRING( p_module->psz_longname );
-    SAVE_STRING( p_module->psz_help );
     SAVE_IMMEDIATE( p_module->i_shortcuts );
     for( unsigned j = 0; j < p_module->i_shortcuts; j++ )
          SAVE_STRING( p_module->pp_shortcuts[j] );
diff --git a/src/modules/entry.c b/src/modules/entry.c
index 2991ad1..afc7159 100644
--- a/src/modules/entry.c
+++ b/src/modules/entry.c
@@ -252,6 +252,8 @@ int vlc_plugin_set (module_t *module, module_config_t *item, int propid, ...)
             break;
 
         case VLC_MODULE_HELP:
+            assert (module->parent == NULL);
+            assert (module->psz_help == NULL);
             module->psz_help = va_arg (ap, char *);
             break;