mmsh: cleanup

[vlc] / modules / meta_engine / folder.c

diff --git a/modules/meta_engine/folder.c b/modules/meta_engine/folder.c
index d52bb60baf2e128c396f3a2a7281a8df1a1b51ec..4d41b0ac199ff5d55df280aaf5e3f4f6e8c5d905 100644 (file)
--- a/modules/meta_engine/folder.c
+++ b/modules/meta_engine/folder.c
@@ -25,11 +25,13 @@
  * Preamble
  *****************************************************************************/
 
-#include <vlc/vlc.h>
-#include <vlc_interface.h>
-#include <vlc_meta.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_playlist.h>
-#include <vlc_input.h>
 #include <vlc_charset.h>
 
 #ifdef HAVE_SYS_STAT_H
@@ -49,28 +51,32 @@ static int FindMeta( vlc_object_t * );
  * Module descriptor
  *****************************************************************************/
 
-vlc_module_begin();
-    set_shortname( N_( "Folder" ) );
-    set_description( _("Folder meta data") );
+vlc_module_begin ()
+    set_shortname( N_( "Folder" ) )
+    set_description( N_("Folder meta data") )
 
-    set_capability( "art finder", 90 );
-    set_callbacks( FindMeta, NULL );
-vlc_module_end();
+    set_capability( "art finder", 90 )
+    set_callbacks( FindMeta, NULL )
+vlc_module_end ()
 
 /*****************************************************************************
  *****************************************************************************/
 static int FindMeta( vlc_object_t *p_this )
 {
-    playlist_t *p_playlist = (playlist_t *)p_this;
-    input_item_t *p_item = (input_item_t *)(p_playlist->p_private);
-    vlc_bool_t b_have_art = VLC_FALSE;
+    input_item_t *p_item = (input_item_t *)p_this->p_private;
+    bool b_have_art = false;
 
     int i = 0;
     struct stat a;
     char psz_filename[MAX_PATH];
+    if( !p_item )
+        return VLC_EGENERIC;
+
     char *psz_dir = input_item_GetURI( p_item );
-    char *psz_buf = strrchr( psz_dir, '/' );
+    if( !psz_dir )
+        return VLC_EGENERIC;
 
+    char *psz_buf = strrchr( psz_dir, '/' );
     if( psz_buf )
     {
         psz_buf++;
@@ -85,7 +91,7 @@ static int FindMeta( vlc_object_t *p_this )
     if( !strncmp( psz_path, "file://", 7 ) )
         psz_path += 7;
 
-    for( i = 0; b_have_art == VLC_FALSE && i < 3; i++ )
+    for( i = 0; b_have_art == false && i < 3; i++ )
     {
         switch( i )
         {
@@ -111,7 +117,7 @@ static int FindMeta( vlc_object_t *p_this )
         if( utf8_stat( psz_filename+7, &a ) != -1 )
         {
             input_item_SetArtURL( p_item, psz_filename );
-            b_have_art = VLC_TRUE;
+            b_have_art = true;
         }
     }