Small warning fix.

[vlc] / modules / access / http.c

diff --git a/modules/access/http.c b/modules/access/http.c
index ad5c9123c375d44e51f0d5e84ab6dcfbfa4af3af..651e250647375474f71879f2d480bd2cb3b3d7f4 100644 (file)
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -40,6 +40,7 @@
 #include <vlc_network.h>
 #include <vlc_url.h>
 #include <vlc_tls.h>
+#include <vlc_strings.h>
 
 /*****************************************************************************
  * Module descriptor
@@ -265,18 +266,28 @@ static int Open( vlc_object_t *p_this )
 
 connect:
     /* Connect */
-    if( Connect( p_access, 0 ) )
+    switch( Connect( p_access, 0 ) )
     {
-        /* Retry with http 1.0 */
-        msg_Dbg( p_access, "switching to HTTP version 1.0" );
-        p_sys->i_version = 0;
-        p_sys->b_seekable = VLC_FALSE;
-
-        if( p_access->b_die ||
-            Connect( p_access, 0 ) )
-        {
+        case -1:
             goto error;
-        }
+
+        case -2:
+            /* Retry with http 1.0 */
+            msg_Dbg( p_access, "switching to HTTP version 1.0" );
+            p_sys->i_version = 0;
+            p_sys->b_seekable = VLC_FALSE;
+
+            if( p_access->b_die || Connect( p_access, 0 ) )
+                goto error;
+
+#ifdef DEBUG
+        case 0:
+            break;
+
+        default:
+            msg_Err( p_access, "You should not be here" );
+            abort();
+#endif
     }
 
     if( p_sys->i_code == 401 )
@@ -787,10 +798,10 @@ static int Connect( access_t *p_access, int64_t i_tell )
 
     /* Open connection */
     p_sys->fd = net_ConnectTCP( p_access, srv.psz_host, srv.i_port );
-    if( p_sys->fd < 0 )
+    if( p_sys->fd == -1 )
     {
         msg_Err( p_access, "cannot connect to %s:%d", srv.psz_host, srv.i_port );
-        return VLC_EGENERIC;
+        return -1;
     }
 
     /* Initialize TLS/SSL session */
@@ -806,7 +817,7 @@ static int Connect( access_t *p_access, int64_t i_tell )
             {
                 /* CONNECT is not in HTTP/1.0 */
                 Disconnect( p_access );
-                return VLC_EGENERIC;
+                return -1;
             }
 
             net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL,
@@ -820,7 +831,7 @@ static int Connect( access_t *p_access, int64_t i_tell )
             {
                 msg_Err( p_access, "cannot establish HTTP/TLS tunnel" );
                 Disconnect( p_access );
-                return VLC_EGENERIC;
+                return -1;
             }
 
             sscanf( psz, "HTTP/%*u.%*u %3u", &i_status );
@@ -830,7 +841,7 @@ static int Connect( access_t *p_access, int64_t i_tell )
             {
                 msg_Err( p_access, "HTTP/TLS tunnel through proxy denied" );
                 Disconnect( p_access );
-                return VLC_EGENERIC;
+                return -1;
             }
 
             do
@@ -840,7 +851,7 @@ static int Connect( access_t *p_access, int64_t i_tell )
                 {
                     msg_Err( p_access, "HTTP proxy connection failed" );
                     Disconnect( p_access );
-                    return VLC_EGENERIC;
+                    return -1;
                 }
 
                 if( *psz == '\0' )
@@ -858,12 +869,12 @@ static int Connect( access_t *p_access, int64_t i_tell )
         {
             msg_Err( p_access, "cannot establish HTTP/TLS session" );
             Disconnect( p_access );
-            return VLC_EGENERIC;
+            return -1;
         }
         p_sys->p_vs = &p_sys->p_tls->sock;
     }
 
-    return Request( p_access, i_tell );
+    return Request( p_access, i_tell ) ? -2 : 0;
 }
 
 
@@ -892,7 +903,7 @@ static int Request( access_t *p_access, int64_t i_tell )
     }
     else
     {
-        char *psz_path = p_sys->url.psz_path;
+        const char *psz_path = p_sys->url.psz_path;
         if( !psz_path || !*psz_path )
         {
             psz_path = "/";