libvlc: use vlc_common.h (libvlccore) instead of vlc/vlc.h

[vlc] / src / network / tcp.c

diff --git a/src/network/tcp.c b/src/network/tcp.c
index 2dbaa64487d2617177c809ff9422da131758b08d..87bcdb26ab0d83f6c2f7b14ec5c3dbc74848c4a0 100644 (file)
--- a/src/network/tcp.c
+++ b/src/network/tcp.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <errno.h>
 #include <assert.h>
@@ -85,10 +85,6 @@ int __net_Connect( vlc_object_t *p_this, const char *psz_host, int i_port,
     if (evfd == -1)
         return -1;
 
-    if( i_port == 0 )
-        i_port = 80; /* historical VLC thing */
-
-
     memset( &hints, 0, sizeof( hints ) );
     hints.ai_socktype = SOCK_STREAM;
 
@@ -349,7 +345,7 @@ static int SocksNegociate( vlc_object_t *p_obj,
 {
     uint8_t buffer[128+2*256];
     int i_len;
-    vlc_bool_t b_auth = VLC_FALSE;
+    bool b_auth = false;
 
     if( i_socks_version != 5 )
         return VLC_SUCCESS;
@@ -357,7 +353,7 @@ static int SocksNegociate( vlc_object_t *p_obj,
     /* We negociate authentication */
 
     if( ( psz_socks_user == NULL ) && ( psz_socks_passwd == NULL ) )
-        b_auth = VLC_TRUE;
+        b_auth = true;
 
     buffer[0] = i_socks_version;    /* SOCKS version */
     if( b_auth )
@@ -376,7 +372,7 @@ static int SocksNegociate( vlc_object_t *p_obj,
 
     if( net_Write( p_obj, fd, NULL, buffer, i_len ) != i_len )
         return VLC_EGENERIC;
-    if( net_Read( p_obj, fd, NULL, buffer, 2, VLC_TRUE ) != 2 )
+    if( net_Read( p_obj, fd, NULL, buffer, 2, true ) != 2 )
         return VLC_EGENERIC;
 
     msg_Dbg( p_obj, "socks: v=%d method=%x", buffer[0], buffer[1] );
@@ -403,7 +399,7 @@ static int SocksNegociate( vlc_object_t *p_obj,
         if( net_Write( p_obj, fd, NULL, buffer, i_len ) != i_len )
             return VLC_EGENERIC;
 
-        if( net_Read( p_obj, fd, NULL, buffer, 2, VLC_TRUE ) != 2 )
+        if( net_Read( p_obj, fd, NULL, buffer, 2, true ) != 2 )
             return VLC_EGENERIC;
 
         msg_Dbg( p_obj, "socks: v=%d status=%x", buffer[0], buffer[1] );
@@ -471,7 +467,7 @@ static int SocksHandshakeTCP( vlc_object_t *p_obj,
 
         if( net_Write( p_obj, fd, NULL, buffer, 9 ) != 9 )
             return VLC_EGENERIC;
-        if( net_Read( p_obj, fd, NULL, buffer, 8, VLC_TRUE ) != 8 )
+        if( net_Read( p_obj, fd, NULL, buffer, 8, true ) != 8 )
             return VLC_EGENERIC;
 
         msg_Dbg( p_obj, "socks: v=%d cd=%d",
@@ -501,7 +497,7 @@ static int SocksHandshakeTCP( vlc_object_t *p_obj,
             return VLC_EGENERIC;
 
         /* Read the header */
-        if( net_Read( p_obj, fd, NULL, buffer, 5, VLC_TRUE ) != 5 )
+        if( net_Read( p_obj, fd, NULL, buffer, 5, true ) != 5 )
             return VLC_EGENERIC;
 
         msg_Dbg( p_obj, "socks: v=%d rep=%d atyp=%d",
@@ -523,7 +519,7 @@ static int SocksHandshakeTCP( vlc_object_t *p_obj,
         else
             return VLC_EGENERIC;
 
-        if( net_Read( p_obj, fd, NULL, buffer, i_len, VLC_TRUE ) != i_len )
+        if( net_Read( p_obj, fd, NULL, buffer, i_len, true ) != i_len )
             return VLC_EGENERIC;
     }