[vlc-commits] modules: fix variable shadowing

Rémi Denis-Courmont git at videolan.org
Thu Jun 29 22:35:00 CEST 2017


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jun 29 22:44:26 2017 +0300| [9bf573128c61dae322f79b15700e9b3e3a1d5400] | committer: Rémi Denis-Courmont

modules: fix variable shadowing

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

 src/modules/entry.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/modules/entry.c b/src/modules/entry.c
index 4fc036281c..5557d8ddfb 100644
--- a/src/modules/entry.c
+++ b/src/modules/entry.c
@@ -200,7 +200,7 @@ static int vlc_plugin_desc_cb(void *ctx, void *tgt, int propid, ...)
     {
         case VLC_MODULE_CREATE:
         {
-            module_t *module = plugin->module;
+            module_t *super = plugin->module;
             module_t *submodule = vlc_module_create(plugin);
             if (unlikely(submodule == NULL))
             {
@@ -214,12 +214,12 @@ static int vlc_plugin_desc_cb(void *ctx, void *tgt, int propid, ...)
 
             /* Inheritance. Ugly!! */
             submodule->pp_shortcuts = xmalloc (sizeof ( *submodule->pp_shortcuts ));
-            submodule->pp_shortcuts[0] = module->pp_shortcuts[0];
+            submodule->pp_shortcuts[0] = super->pp_shortcuts[0];
             submodule->i_shortcuts = 1; /* object name */
 
-            submodule->psz_shortname = module->psz_shortname;
-            submodule->psz_longname = module->psz_longname;
-            submodule->psz_capability = module->psz_capability;
+            submodule->psz_shortname = super->psz_shortname;
+            submodule->psz_longname = super->psz_longname;
+            submodule->psz_capability = super->psz_capability;
             break;
         }
 



More information about the vlc-commits mailing list