[vlc-commits] http: inline one function

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jun 30 22:22:11 2016 +0300| [5a2b502bc16a09cacbad611f6e79a1cd44396721] | committer: Rémi Denis-Courmont

http: inline one function

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

 modules/access/http.c |   17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/modules/access/http.c b/modules/access/http.c
index dec48be..2f66299 100644
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -149,7 +149,6 @@ static int Control( access_t *, int, va_list );
 
 /* */
 static int Connect( access_t *, uint64_t );
-static int Request( access_t *p_access, uint64_t i_tell );
 static void Disconnect( access_t * );
 
 
@@ -872,15 +871,6 @@ static int Connect( access_t *p_access, uint64_t i_tell )
         }
     }
 
-    return Request( p_access, i_tell ) ? -2 : 0;
-}
-
-
-static int Request( access_t *p_access, uint64_t i_tell )
-{
-    access_sys_t   *p_sys = p_access->p_sys;
-    char           *psz ;
-
     const char *psz_path = p_sys->url.psz_path;
     if( !psz_path || !*psz_path )
         psz_path = "/";
@@ -936,10 +926,11 @@ static int Request( access_t *p_access, uint64_t i_tell )
     {
         msg_Err( p_access, "failed to send request" );
         Disconnect( p_access );
-        return VLC_EGENERIC;
+        return -2;
     }
 
     /* Read Answer */
+    char *psz;
     if( p_sys->p_tls != NULL )
         psz = vlc_tls_GetLine( p_sys->p_tls );
     else
@@ -1223,11 +1214,11 @@ static int Request( access_t *p_access, uint64_t i_tell )
 
         free( psz );
     }
-    return VLC_SUCCESS;
+    return 0;
 
 error:
     Disconnect( p_access );
-    return VLC_EGENERIC;
+    return -2;
 }
 
 /*****************************************************************************