From: Rémi Denis-Courmont <remi@remlab.net>
Date: Sat, 20 Feb 2010 18:57:48 +0000 (+0200)
Subject: folder: use make_path
X-Git-Tag: 1.1.0-pre1~790
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=d459aab3dd59d8264cb15656bacb3e3de5f2dffa;p=vlc

folder: use make_path
---

diff --git a/modules/meta_engine/folder.c b/modules/meta_engine/folder.c
index 9c30d3ecf8..3fb65ca8ad 100644
--- a/modules/meta_engine/folder.c
+++ b/modules/meta_engine/folder.c
@@ -90,20 +90,12 @@ static int FindMeta( vlc_object_t *p_this )
     if( !psz_dir )
         return VLC_EGENERIC;
 
-    char *psz_path = psz_dir;
-    if( strncmp( psz_path, "file://", 7 ) || !decode_URI( psz_path + 7 ) )
-    {
-        free( psz_dir );
+    char *psz_path = make_path( psz_dir );
+    free( psz_dir );
+    if( psz_path == NULL )
         return VLC_EGENERIC;
-    }
 
-#if defined(WIN32) && !defined(UNDER_CE)
-    psz_path += 8;
-#else
-    psz_path += 7;
-#endif
-
-    char *psz_buf = strrchr( psz_path, '/' );
+    char *psz_buf = strrchr( psz_path, DIR_SEP_CHAR );
     if( psz_buf )
         *++psz_buf = '\0';
     else
@@ -134,7 +126,5 @@ static int FindMeta( vlc_object_t *p_this )
         }
     }
 
-    free( psz_dir );
-
     return b_have_art ? VLC_SUCCESS : VLC_EGENERIC;
 }