s/OpenTCP/ConnectTCP/ for consistency

[vlc] / modules / access / mms / mmsh.c

diff --git a/modules/access/mms/mmsh.c b/modules/access/mms/mmsh.c
index 696352ec88573c973fd1f4cd8eea33468643fef8..738b94405a03357ff4295767e3a9be3474f94670 100644 (file)
--- a/modules/access/mms/mmsh.c
+++ b/modules/access/mms/mmsh.c
@@ -206,7 +206,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
 
         case ACCESS_GET_PRIVATE_ID_STATE:
             i_int = (int)va_arg( args, int );
-            pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t );
+            pb_bool = (vlc_bool_t *)va_arg( args, vlc_bool_t * );
 
             if( i_int < 0 || i_int > 127 )
                 return VLC_EGENERIC;
@@ -286,12 +286,12 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len )
     if( p_access->info.b_eof )
         return 0;
 
-    while( i_data < i_len )
+    while( i_data < (size_t) i_len )
     {
         if( p_access->info.i_pos < p_sys->i_start + p_sys->i_header )
         {
             int i_offset = p_access->info.i_pos - p_sys->i_start;
-            i_copy = __MIN( p_sys->i_header - i_offset, i_len - i_data );
+            i_copy = __MIN( p_sys->i_header - i_offset, (int)((size_t)i_len - i_data) );
             memcpy( &p_buffer[i_data], &p_sys->p_header[i_offset], i_copy );
 
             i_data += i_copy;
@@ -386,7 +386,7 @@ static int Describe( access_t  *p_access, char **ppsz_location )
     p_sys->p_packet = NULL;
     E_( GenerateGuid )( &p_sys->guid );
 
-    if( ( p_sys->fd = net_OpenTCP( p_access, p_sys->url.psz_host,
+    if( ( p_sys->fd = net_ConnectTCP( p_access, p_sys->url.psz_host,
                                             p_sys->url.i_port ) ) < 0 )
     {
         msg_Err( p_access, "cannot connect to %s:%d", p_sys->url.psz_host, p_sys->url.i_port );
@@ -541,7 +541,7 @@ static int Describe( access_t  *p_access, char **ppsz_location )
      *        and bitrate mutual exclusion(optional) */
     E_( asf_HeaderParse )( &p_sys->asfh,
                            p_sys->p_header, p_sys->i_header );
-    msg_Dbg( p_access, "packet count=%lld packet size=%d",
+    msg_Dbg( p_access, "packet count="I64Fd" packet size=%d",
              p_sys->asfh.i_data_packets_count,
              p_sys->asfh.i_min_data_packet_size );
 
@@ -574,7 +574,7 @@ static int Start( access_t *p_access, off_t i_pos )
 
     msg_Dbg( p_access, "starting stream" );
 
-    if( ( p_sys->fd = net_OpenTCP( p_access, p_sys->url.psz_host,
+    if( ( p_sys->fd = net_ConnectTCP( p_access, p_sys->url.psz_host,
                                             p_sys->url.i_port ) ) < 0 )
     {
         /* should not occur */