[vlc-commits] input/meta: post-pone variable-declaration in vlc_meta_Merge

[Filip Roséen]

vlc | branch: master | Filip Roséen <filip at atch.se> | Mon Oct 10 18:17:56 2016 +0200| [a325c7a42f7f696744cb78f72d9693e1c799364a] | committer: Thomas Guillem

input/meta: post-pone variable-declaration in vlc_meta_Merge

ppsz_all_keys is not used until later in the function, as such the
declaration has been move to the point of initialization (ie. where we
actually need it).

Signed-off-by: Thomas Guillem <thomas at gllm.fr>

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

 src/input/meta.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/input/meta.c b/src/input/meta.c
index 2102eed..3255c49 100644
--- a/src/input/meta.c
+++ b/src/input/meta.c
@@ -176,8 +176,6 @@ void vlc_meta_SetStatus( vlc_meta_t *m, int status )
  */
 void vlc_meta_Merge( vlc_meta_t *dst, const vlc_meta_t *src )
 {
-    char **ppsz_all_keys;
-
     if( !dst || !src )
         return;
 
@@ -191,7 +189,7 @@ void vlc_meta_Merge( vlc_meta_t *dst, const vlc_meta_t *src )
     }
 
     /* XXX: If speed up are needed, it is possible */
-    ppsz_all_keys = vlc_dictionary_all_keys( &src->extra_tags );
+    char **ppsz_all_keys = vlc_dictionary_all_keys( &src->extra_tags );
     for( int i = 0; ppsz_all_keys && ppsz_all_keys[i]; i++ )
     {
         /* Always try to remove the previous value */