Fixed compilation warning.

[vlc] / modules / access / http.c

diff --git a/modules/access/http.c b/modules/access/http.c
index 5d374f950d71663f7eec3399540d15a15b24325e..a42669589bdbdc321c693296a6aca06591b13c66 100644 (file)
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -26,17 +26,21 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#define _GNU_SOURCE
+#include <vlc/vlc.h>
+
+#include <string.h>
 #include <stdlib.h>
 
-#include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <vlc_access.h>
 
-#include "vlc_interaction.h"
-#include "vlc_playlist.h"
-#include "vlc_meta.h"
-#include "network.h"
-#include "vlc_url.h"
-#include "vlc_tls.h"
+#include <vlc_interface.h>
+#include <vlc_playlist.h>
+#include <vlc_meta.h>
+#include <vlc_network.h>
+#include <vlc_url.h>
+#include <vlc_tls.h>
+#include <vlc_strings.h>
 
 /*****************************************************************************
  * Module descriptor
@@ -115,7 +119,7 @@ struct access_sys_t
 
     /* */
     int        i_code;
-    char       *psz_protocol;
+    const char *psz_protocol;
     int        i_version;
 
     char       *psz_mime;
@@ -262,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 )
@@ -282,7 +296,7 @@ connect:
         int i_ret;
         msg_Dbg( p_access, "authentication failed" );
         i_ret = intf_UserLoginPassword( p_access, _("HTTP authentication"),
-                        _("Please enter a valid login name and a password."), 
+                        _("Please enter a valid login name and a password."),
                                                 &psz_login, &psz_password );
         if( i_ret == DIALOG_OK_YES )
         {
@@ -320,16 +334,10 @@ connect:
             goto error;
         }
 
-        p_playlist = vlc_object_find( p_access, VLC_OBJECT_PLAYLIST,
-                                      FIND_ANYWHERE );
-        if( !p_playlist )
-        {
-            msg_Err( p_access, "redirection failed: can't find playlist" );
-            goto error;
-        }
-
         /* Change the URI */
-        vlc_mutex_lock( &p_playlist->object_lock );
+        p_playlist = pl_Yield( p_access );
+        PL_LOCK;
+
         p_input_item = p_playlist->status.p_item->p_input;
         vlc_mutex_lock( &p_input_item->lock );
         free( p_input_item->psz_uri );
@@ -337,8 +345,9 @@ connect:
         p_input_item->psz_uri = strdup( p_sys->psz_location );
         p_access->psz_path = strdup( p_sys->psz_location );
         vlc_mutex_unlock( &p_input_item->lock );
-        vlc_mutex_unlock( &p_playlist->object_lock );
-        vlc_object_release( p_playlist );
+
+        PL_UNLOCK;
+        pl_Release( p_access );
 
         /* Clean up current Open() run */
         vlc_UrlClean( &p_sys->url );
@@ -789,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 */
@@ -808,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,
@@ -822,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 );
@@ -832,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
@@ -842,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' )
@@ -860,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;
 }
 
 
@@ -894,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 = "/";