[vlc-commits] modules: remove stray assertions

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Oct 27 23:07:40 2016 +0300| [fa8b7c58dce9e5ac309df1f8e4640ce47d3a86cf] | committer: Rémi Denis-Courmont

modules: remove stray assertions

These no longer make sense.

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

 src/modules/bank.c  | 2 --
 src/modules/entry.c | 5 -----
 2 files changed, 7 deletions(-)

diff --git a/src/modules/bank.c b/src/modules/bank.c
index f405974..c202eb2 100644
--- a/src/modules/bank.c
+++ b/src/modules/bank.c
@@ -72,7 +72,6 @@ static vlc_plugin_t *module_InitStatic(vlc_plugin_cb entry)
     if (unlikely(lib == NULL))
         return NULL;
 
-    assert(lib->module != NULL);
     atomic_init(&lib->loaded, true);
     lib->unloadable = false;
     return lib;
@@ -477,7 +476,6 @@ void module_InitBank (void)
          * options of core will be available in the module bank structure just
          * as for every other module. */
         vlc_plugin_t *plugin = module_InitStatic(vlc_entry__core);
-        assert(plugin != NULL);
         if (likely(plugin != NULL))
             module_StoreBank(plugin);
         config_SortConfig ();
diff --git a/src/modules/entry.c b/src/modules/entry.c
index 36af1f2..2cfe201 100644
--- a/src/modules/entry.c
+++ b/src/modules/entry.c
@@ -292,8 +292,6 @@ static int vlc_plugin_desc_cb(void *ctx, void *tgt, int propid, ...)
         }
 
         case VLC_MODULE_SHORTNAME:
-            assert(module->psz_shortname == NULL
-                || module->plugin->module != module);
             module->psz_shortname = va_arg (ap, const char *);
             break;
 
@@ -303,13 +301,10 @@ static int vlc_plugin_desc_cb(void *ctx, void *tgt, int propid, ...)
             break;
 
         case VLC_MODULE_HELP:
-            assert(module->plugin->module == module);
-            assert(module->psz_help == NULL);
             module->psz_help = va_arg (ap, const char *);
             break;
 
         case VLC_MODULE_TEXTDOMAIN:
-            assert(plugin->textdomain == NULL);
             plugin->textdomain = va_arg(ap, const char *);
             break;