codecleanup: Replace input_Item by input_item.

[vlc] / modules / control / http / util.c

diff --git a/modules/control/http/util.c b/modules/control/http/util.c
index c107d2e0d29c6c22bdffad8db7373e1b3c865054..54ba5c44b8e2dc4058a7bb5a0ca83ed0e8066818 100644 (file)
--- a/modules/control/http/util.c
+++ b/modules/control/http/util.c
@@ -184,6 +184,13 @@ int ParseDirectory( intf_thread_t *p_intf, char *psz_root,
     if( ACL_LoadFile( p_acl, dir ) )
     {
         ACL_Destroy( p_acl );
+
+        struct stat st;
+        if( stat( dir, &st ) == 0 )
+        {
+            closedir( p_dir );
+            return VLC_EGENERIC;
+        }
         p_acl = NULL;
     }
 
@@ -308,13 +315,14 @@ int ParseDirectory( intf_thread_t *p_intf, char *psz_root,
 
                 if( b_index && ( p = strstr( f->file, "index." ) ) )
                 {
-                    asprintf( &psz_redir, "%s%s", f->name, p );
-
-                    msg_Dbg( p_intf, "redir=%s -> %s", psz_redir, f->name );
-                    f->p_redir2 = httpd_RedirectNew( p_sys->p_httpd_host,
-                                                     f->name, psz_redir );
+                    if( asprintf( &psz_redir, "%s%s", f->name, p ) != -1 )
+                    {
+                        msg_Dbg( p_intf, "redir=%s -> %s", psz_redir, f->name );
+                        f->p_redir2 = httpd_RedirectNew( p_sys->p_httpd_host,
+                                                         f->name, psz_redir );
 
-                    free( psz_redir );
+                        free( psz_redir );
+                    }
                 }
             }
         }
@@ -840,7 +848,7 @@ input_item_t *MRLParse( intf_thread_t *p_intf, char *_psz,
         s_temp = s_mrl + strlen( s_mrl );
     }
 
-    p_input = input_ItemNew( p_intf, s_mrl, psz_name );
+    p_input = input_item_New( p_intf, s_mrl, psz_name );
     s_mrl = s_temp;
 
     /* now we can take care of the options */
@@ -853,7 +861,7 @@ input_item_t *MRLParse( intf_thread_t *p_intf, char *_psz,
         {
             s_temp = s_mrl + strlen( s_mrl );
         }
-        input_ItemAddOption( p_input, s_mrl );
+        input_item_AddOption( p_input, s_mrl );
         s_mrl = s_temp;
     }
 
@@ -864,7 +872,7 @@ input_item_t *MRLParse( intf_thread_t *p_intf, char *_psz,
 /**********************************************************************
  * RealPath: parse ../, ~ and path stuff
  **********************************************************************/
-char *RealPath( intf_thread_t *p_intf, const char *psz_src )
+char *RealPath( const char *psz_src )
 {
     char *psz_dir;
     char *p;