From: Derk-Jan Hartman <hartman@videolan.org>
Date: Sun, 17 Aug 2008 23:04:15 +0000 (+0200)
Subject: taglib: fix variable scoping
X-Git-Tag: 0.9.0~246
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=abcff2bd9243c8064ab289bf9138a4cb68e55e01;p=vlc

taglib: fix variable scoping
---

diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index 1845f6f91a..4441255ea5 100644
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -245,6 +245,7 @@ static int ReadMeta( vlc_object_t *p_this )
     demux_t         *p_demux = (demux_t *)p_this;
     demux_meta_t    *p_demux_meta = (demux_meta_t*)p_demux->p_private;
     vlc_meta_t      *p_meta;
+    TagLib::FileRef  f;
 
     TAB_INIT( p_demux_meta->i_attachments, p_demux_meta->attachments );
     p_demux_meta->p_meta = NULL;
@@ -254,22 +255,19 @@ static int ReadMeta( vlc_object_t *p_this )
     {
         wchar_t wpath[MAX_PATH + 1];
         if( !MultiByteToWideChar( CP_UTF8, 0, p_demux->psz_path, -1, wpath, MAX_PATH) )
-        {
-            errno = ENOENT;
             return VLC_EGENERIC;
-        }
+
         wpath[MAX_PATH] = L'0';
-        FileRef f( wpath );
+        f = FileRef( wpath );
     }
     else return VLC_EGENERIC;
 #else
     const char *local_name = ToLocale( p_demux->psz_path );
 
     if( local_name == NULL )
-    {
         return VLC_EGENERIC;
-    }
-    FileRef f( local_name );
+
+    f = FileRef( local_name );
     LocaleFree( local_name );
 #endif