s/OpenTCP/ConnectTCP/ for consistency

[vlc] / modules / access / tcp.c

diff --git a/modules/access/tcp.c b/modules/access/tcp.c
index c66d0a1dd6376314e5d543279911f0d8ab242780..ed491e5bf4dafd5463bdb648b7d400d25e810981 100644 (file)
--- a/modules/access/tcp.c
+++ b/modules/access/tcp.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * tcp.c: TCP input module
  *****************************************************************************
- * Copyright (C) 2003-2004 VideoLAN
+ * Copyright (C) 2003-2004 the VideoLAN team
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -80,33 +80,23 @@ static int Open( vlc_object_t *p_this )
     char         *psz_parser = psz_dup;
 
     /* Parse server:port */
-    while( *psz_parser && *psz_parser != ':' )
+    if( *psz_parser == '[' )
     {
-        if( *psz_parser == '[' )
-        {
-            /* IPV6 */
-            while( *psz_parser && *psz_parser  != ']' )
-            {
-                psz_parser++;
-            }
-        }
-        psz_parser++;
+        psz_parser = strchr( psz_parser, ']' );
+        if( psz_parser == NULL )
+            psz_parser = psz_dup;
     }
-    if( *psz_parser != ':' || psz_parser == psz_dup )
-    {
-        msg_Err( p_access, "you have to provide server:port addresse" );
-        free( psz_dup );
-        return VLC_EGENERIC;
-    }
-    *psz_parser++ = '\0';
+    psz_parser = strchr( psz_parser, ':' );
 
-    if( atoi( psz_parser ) <= 0 )
+    if( psz_parser == NULL )
     {
-        msg_Err( p_access, "invalid port number (%d)", atoi( psz_parser ) );
+        msg_Err( p_access, "missing port number : %s", psz_dup );
         free( psz_dup );
         return VLC_EGENERIC;
     }
 
+    *psz_parser++ = '\0';
+
     /* Init p_access */
     p_access->pf_read = Read;
     p_access->pf_block = NULL;
@@ -120,7 +110,7 @@ static int Open( vlc_object_t *p_this )
     p_access->info.i_seekpoint = 0;
     p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) );
 
-    p_sys->fd = net_OpenTCP( p_access, psz_dup, atoi( psz_parser ) );
+    p_sys->fd = net_ConnectTCP( p_access, psz_dup, atoi( psz_parser ) );
     free( psz_dup );
 
     if( p_sys->fd < 0 )