[vlc-commits] Remove unused ACL parameter of httpd_StreamNew()

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Apr  1 22:50:45 2012 +0300| [e8150e430899f16517d67b28a64d37dd35d3348a] | committer: Rémi Denis-Courmont

Remove unused ACL parameter of httpd_StreamNew()

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e8150e430899f16517d67b28a64d37dd35d3348a
---

 include/vlc_httpd.h          |    2 +-
 modules/access_output/http.c |    2 +-
 src/missing.c                |    5 ++---
 src/network/httpd.c          |    5 ++---
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/include/vlc_httpd.h b/include/vlc_httpd.h
index e851481..1c4aaf7 100644
--- a/include/vlc_httpd.h
+++ b/include/vlc_httpd.h
@@ -124,7 +124,7 @@ VLC_API httpd_redirect_t * httpd_RedirectNew( httpd_host_t *, const char *psz_ur
 VLC_API void httpd_RedirectDelete( httpd_redirect_t * );
 
 
-VLC_API httpd_stream_t * httpd_StreamNew( 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 ) VLC_USED;
+VLC_API httpd_stream_t * httpd_StreamNew( httpd_host_t *, const char *psz_url, const char *psz_mime, const char *psz_user, const char *psz_password ) VLC_USED;
 VLC_API void httpd_StreamDelete( httpd_stream_t * );
 VLC_API int httpd_StreamHeader( httpd_stream_t *, uint8_t *p_data, int i_data );
 VLC_API int httpd_StreamSend( httpd_stream_t *, uint8_t *p_data, int i_data );
diff --git a/modules/access_output/http.c b/modules/access_output/http.c
index 137d786..c2be0f0 100644
--- a/modules/access_output/http.c
+++ b/modules/access_output/http.c
@@ -212,7 +212,7 @@ static int Open( vlc_object_t *p_this )
 
     p_sys->p_httpd_stream =
         httpd_StreamNew( p_sys->p_httpd_host, path, psz_mime,
-                         psz_user, psz_pwd, NULL );
+                         psz_user, psz_pwd );
     free( psz_user );
     free( psz_pwd );
     free( psz_mime );
diff --git a/src/missing.c b/src/missing.c
index 58082d9..de6a771 100644
--- a/src/missing.c
+++ b/src/missing.c
@@ -156,11 +156,10 @@ int httpd_StreamHeader (httpd_stream_t *stream, uint8_t *data, int count)
 
 httpd_stream_t *httpd_StreamNew (httpd_host_t *host,
                                  const char *url, const char *content_type,
-                                 const char *login, const char *password,
-                                 const vlc_acl_t *acl)
+                                 const char *login, const char *password)
 {
     (void) host; (void) url; (void) content_type;
-    (void) login; (void) password; (void) acl;
+    (void) login; (void) password;
     assert (0);
 }
 
diff --git a/src/network/httpd.c b/src/network/httpd.c
index c458fca..6335168 100644
--- a/src/network/httpd.c
+++ b/src/network/httpd.c
@@ -848,13 +848,12 @@ static int httpd_StreamCallBack( httpd_callback_sys_t *p_sys,
 
 httpd_stream_t *httpd_StreamNew( httpd_host_t *host,
                                  const char *psz_url, const char *psz_mime,
-                                 const char *psz_user, const char *psz_password,
-                                 const vlc_acl_t *p_acl )
+                                 const char *psz_user, const char *psz_password )
 {
     httpd_stream_t *stream = xmalloc( sizeof( httpd_stream_t ) );
 
     stream->url = httpd_UrlNewPrivate( host, psz_url, psz_user, psz_password,
-                                       p_acl );
+                                       NULL );
     if( stream->url == NULL )
     {
         free( stream );