Remove useless <dirent.h> check

[vlc] / modules / control / http / http.h

diff --git a/modules/control/http/http.h b/modules/control/http/http.h
index f069ee44a41c1ced742e9bb07c418daede9d6488..ebf1efa4e9336fd42762627eac19f0d702864b5f 100644 (file)
--- a/modules/control/http/http.h
+++ b/modules/control/http/http.h
@@ -32,28 +32,16 @@
 #include <vlc_common.h>
 #include <stdlib.h>
 #include <strings.h>
-#include <ctype.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>
 
 #include <vlc_aout.h>
 #include <vlc_vout.h> /* for fullscreen */
 
-#include "vlc_httpd.h"
-#include "vlc_vlm.h"
-#include "vlc_network.h"
-#include "vlc_acl.h"
-#include "vlc_charset.h"
-
-#ifdef HAVE_SYS_STAT_H
-#   include <sys/stat.h>
-#endif
-#ifdef HAVE_ERRNO_H
-#   include <errno.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#   include <fcntl.h>
-#endif
+#include <vlc_httpd.h>
+#include <vlc_vlm.h>
+#include <vlc_network.h>
+#include <vlc_acl.h>
 
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
@@ -61,10 +49,6 @@
 #   include <io.h>
 #endif
 
-#ifdef HAVE_DIRENT_H
-#   include <dirent.h>
-#endif
-
 /* stat() support for large files on win32 */
 #if defined( WIN32 ) && !defined( UNDER_CE )
 #   define stat _stati64
@@ -105,8 +89,6 @@ int ParseDirectory( intf_thread_t *p_intf, char *psz_root,
                         char *psz_dir );
 /** This function loads a file into a buffer */
 int FileLoad( FILE *f, char **pp_data, int *pi_data );
-/** This function creates a suitable URL for a filename */
-char *FileToUrl( char *name, bool *pb_index );
 /** This function returns the real path of a file or directory */
 char *RealPath( const char *psz_src );
 
@@ -200,8 +182,8 @@ void     mvar_AppendNewVar( mvar_t *vars, const char *name,
  * The arg parameter must be of the form "start[:stop[:step]]"  */
 mvar_t *mvar_IntegerSetNew( const char *name, const char *arg );
 
-/** This function creates a set variable with a list of VLC objects */
-mvar_t *mvar_ObjectSetNew( intf_thread_t *p_intf, char *name, const char *arg );
+/** This function creates a set variable with a list of SD plugins */
+mvar_t *mvar_ServicesSetNew( intf_thread_t *p_intf, char *name );
 
 /** This function creates a set variable with the contents of the playlist */
 mvar_t *mvar_PlaylistSetNew( intf_thread_t *p_intf, char *name,
@@ -220,7 +202,8 @@ mvar_t *mvar_FileSetNew( intf_thread_t *p_intf, char *name,
 /** This function creates a set variable representing the VLM streams */
 mvar_t *mvar_VlmSetNew( char *name, vlm_t *vlm );
 
-/** This function converts the listing of a playlist node into a mvar set */
+/** This function converts the listing of a playlist node into a mvar set.
+ *  It must be entered WITH playlist lock! */
 void PlaylistListNode( intf_thread_t *p_intf, playlist_t *p_pl,
                            playlist_item_t *p_node, char *name, mvar_t *s,
                            int i_depth );
@@ -296,14 +279,14 @@ void Execute( httpd_file_sys_t *p_args,
                   char *p_request, int i_request,
                   char **pp_data, int *pi_data,
                   char **pp_dst,
-                  char *_src, char *_end );
+                  const char *_src, const char *_end );
 
 /**@}*/
 
 /**
  * Core stuff
  */
-/** \struct
+/** \struct httpd_file_sys_t
  * This structure represent a single HTML file to be parsed by the macros
  * handling engine */
 struct httpd_file_sys_t
@@ -323,7 +306,7 @@ struct httpd_file_sys_t
     mvar_t        *vars;
 };
 
-/** \struct
+/** \struct http_association_t
  * Structure associating an extension to an external program
  */
 typedef struct http_association_t
@@ -333,7 +316,7 @@ typedef struct http_association_t
     char                **ppsz_argv;
 } http_association_t;
 
-/** \struct
+/** \struct httpd_handler_sys_t
  * This structure represent a single CGI file to be parsed by the macros
  * handling engine */
 struct httpd_handler_sys_t
@@ -346,7 +329,7 @@ struct httpd_handler_sys_t
     http_association_t *p_association;
 };
 
-/** \struct
+/** \struct intf_sys_t
  * Internal service structure for the HTTP interface
  */
 struct intf_sys_t