* modules/access/ftp.c, modules/access/http.c: the http and ftp plugins now implement...

http :)

diff --git a/modules/access/ftp.c b/modules/access/ftp.c
index 22e79f908e90844a126d9b5d47fe3b7d726c53f8..7f8ee4ef62f1475f4822bcef3017d4e8483773ae 100644 (file)
--- a/modules/access/ftp.c
+++ b/modules/access/ftp.c
@@ -2,7 +2,7 @@
  * ftp.c:
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: ftp.c,v 1.12 2003/03/24 20:00:51 gbazin Exp $
+ * $Id: ftp.c,v 1.13 2003/03/24 23:04:07 gbazin Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -70,7 +70,6 @@ static void Close       ( vlc_object_t * );
 static int  Read        ( input_thread_t * p_input, byte_t * p_buffer,
                           size_t i_len );
 static void Seek        ( input_thread_t *, off_t );
-static int  SetProgram  ( input_thread_t *, pgrm_descriptor_t * );
 
 
 static ssize_t NetRead ( input_thread_t *, input_socket_t *, byte_t *, size_t );
@@ -364,7 +363,7 @@ static int Open( vlc_object_t *p_this )
     /* *** set exported functions *** */
     p_input->pf_read = Read;
     p_input->pf_seek = Seek;
-    p_input->pf_set_program = SetProgram;
+    p_input->pf_set_program = input_SetProgram;
     p_input->pf_set_area = NULL;
 
     p_input->p_private = NULL;
@@ -417,15 +416,6 @@ static void Close( vlc_object_t *p_this )
     FREE( p_access->url.psz_private );
 }
 
-/*****************************************************************************
- * SetProgram: do nothing
- *****************************************************************************/
-static int SetProgram( input_thread_t * p_input,
-                       pgrm_descriptor_t * p_program )
-{
-    return( 0 );
-}
-
 /*****************************************************************************
  * Seek: try to go at the right place
  *****************************************************************************/

diff --git a/modules/access/http.c b/modules/access/http.c
index bfab1d49eb6bffab89af4df66e306dda8997e557..e244dfd434bef24d82f718edf423b9746facbea5 100644 (file)
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -2,7 +2,7 @@
  * http.c: HTTP access plug-in
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: http.c,v 1.30 2003/03/24 20:00:51 gbazin Exp $
+ * $Id: http.c,v 1.31 2003/03/24 23:04:07 gbazin Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -65,7 +65,6 @@
 static int  Open       ( vlc_object_t * );
 static void Close      ( vlc_object_t * );
 
-static int  SetProgram ( input_thread_t *, pgrm_descriptor_t * );
 static void Seek       ( input_thread_t *, off_t );
 static ssize_t Read    ( input_thread_t *, byte_t *, size_t );
 
@@ -604,7 +603,7 @@ static int Open( vlc_object_t *p_this )
                       psz_server_addr, i_server_port, psz_path );
 
     p_input->pf_read = Read;
-    p_input->pf_set_program = SetProgram;
+    p_input->pf_set_program = input_SetProgram;
     p_input->pf_set_area = NULL;
     p_input->pf_seek = Seek;
 
@@ -666,15 +665,6 @@ static void Close( vlc_object_t *p_this )
     free( p_access_data );
 }
 
-/*****************************************************************************
- * SetProgram: do nothing
- *****************************************************************************/
-static int SetProgram( input_thread_t * p_input,
-                       pgrm_descriptor_t * p_program )
-{
-    return VLC_SUCCESS;
-}
-
 /*****************************************************************************
  * Seek: close and re-open a connection at the right place
  *****************************************************************************/