X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_httpd.h;h=7be391ebe9e440786340452eaf59da1856bd3500;hb=de587c237065de4696d9d035d0504cdf34990d87;hp=708882988add1e6822d09510b7ead0c221ca91a2;hpb=5d10806a802531229498178360ca122984f3857c;p=vlc diff --git a/include/vlc_httpd.h b/include/vlc_httpd.h index 708882988a..7be391ebe9 100644 --- a/include/vlc_httpd.h +++ b/include/vlc_httpd.h @@ -55,21 +55,21 @@ enum enum { HTTPD_PROTO_NONE, - HTTPD_PROTO_HTTP, - HTTPD_PROTO_RTSP, + HTTPD_PROTO_HTTP, /* HTTP/1.x */ + HTTPD_PROTO_RTSP, /* RTSP/1.x */ + HTTPD_PROTO_HTTP0, /* HTTP/0.x */ }; struct httpd_message_t { httpd_client_t *cl; /* NULL if not throught a connection e vlc internal */ - int i_type; - int i_proto; - int i_version; + uint8_t i_type; + uint8_t i_proto; + uint8_t i_version; /* for an answer */ int i_status; - char *psz_status; /* for a query */ char *psz_url; @@ -117,11 +117,11 @@ VLC_EXPORT( char*, httpd_ServerIP, ( const httpd_client_t *cl, char *ps /* High level */ VLC_EXPORT( httpd_file_t *, httpd_FileNew, ( httpd_host_t *, const char *psz_url, const char *psz_mime, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl, httpd_file_callback_t pf_fill, httpd_file_sys_t * ) ); -VLC_EXPORT( void, httpd_FileDelete, ( httpd_file_t * ) ); +VLC_EXPORT( httpd_file_sys_t *, httpd_FileDelete, ( httpd_file_t * ) ); VLC_EXPORT( httpd_handler_t *, httpd_HandlerNew, ( httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl, httpd_handler_callback_t pf_fill, httpd_handler_sys_t * ) ); -VLC_EXPORT( void, httpd_HandlerDelete, ( httpd_handler_t * ) ); +VLC_EXPORT( httpd_handler_sys_t *, httpd_HandlerDelete, ( httpd_handler_t * ) ); VLC_EXPORT( httpd_redirect_t *, httpd_RedirectNew, ( httpd_host_t *, const char *psz_url_dst, const char *psz_url_src ) ); @@ -136,9 +136,9 @@ VLC_EXPORT( int, httpd_StreamSend, ( httpd_stream_t *, uint8_t *p /* Msg functions facilities */ VLC_EXPORT( void, httpd_MsgInit, ( httpd_message_t * ) ); -VLC_EXPORT( void, httpd_MsgAdd, ( httpd_message_t *, const char *psz_name, const char *psz_value, ... ) ); +VLC_EXPORT( void, httpd_MsgAdd, ( httpd_message_t *, const char *psz_name, const char *psz_value, ... ) LIBVLC_FORMAT( 3, 4 ) ); /* return "" if not found. The string is not allocated */ -VLC_EXPORT( const char *, httpd_MsgGet, ( httpd_message_t *, const char *psz_name ) ); +VLC_EXPORT( const char *, httpd_MsgGet, ( const httpd_message_t *, const char *psz_name ) ); VLC_EXPORT( void, httpd_MsgClean, ( httpd_message_t * ) ); #endif /* _VLC_HTTPD_H */