From ce8ae4bb0c2e7d24e5d50c20a6859b35a7d4cd27 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Mon, 10 Aug 2009 19:49:40 +0300 Subject: [PATCH] Fix variable shadowing --- src/modules/modules.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/modules.c b/src/modules/modules.c index 0a0a24ad2d..f0a015ef04 100644 --- a/src/modules/modules.c +++ b/src/modules/modules.c @@ -499,17 +499,17 @@ module_t * __module_need( vlc_object_t *p_this, const char *psz_capability, /* If we required a shortcut, check this plugin provides it. */ if( i_shortcuts > 0 ) { - const char *psz_name = psz_shortcuts; + const char *name = psz_shortcuts; for( unsigned i_short = i_shortcuts; i_short > 0; i_short-- ) { for( unsigned i = 0; p_module->pp_shortcuts[i]; i++ ) { char *c; - if( ( c = strchr( psz_name, '@' ) ) - ? !strncasecmp( psz_name, p_module->pp_shortcuts[i], - c-psz_name ) - : !strcasecmp( psz_name, p_module->pp_shortcuts[i] ) ) + if( ( c = strchr( name, '@' ) ) + ? !strncasecmp( name, p_module->pp_shortcuts[i], + c-name ) + : !strcasecmp( name, p_module->pp_shortcuts[i] ) ) { /* Found it */ if( c && c[1] ) @@ -520,7 +520,7 @@ module_t * __module_need( vlc_object_t *p_this, const char *psz_capability, } /* Go to the next shortcut... This is so lame! */ - psz_name += strlen( psz_name ) + 1; + name += strlen( name ) + 1; } /* If we are in "strict" mode and we couldn't -- 2.39.5