From 94a752b77d8efb5ab8864413a4636db6c904d659 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <rem@videolan.org>
Date: Mon, 5 Dec 2005 09:01:29 +0000
Subject: [PATCH] s/OpenTCP/ConnectTCP/ for consistency and other cosmetic
fixes
---
modules/access/ftp.c | 6 +++---
modules/access/http.c | 2 +-
modules/access/mms/mmsh.c | 4 ++--
modules/access/mms/mmstu.c | 2 +-
modules/access/rtsp/access.c | 2 +-
modules/access/tcp.c | 2 +-
modules/misc/network/ipv4.c | 2 +-
modules/misc/network/ipv6.c | 3 +--
8 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/modules/access/ftp.c b/modules/access/ftp.c
index ccc10ce0cbff..9a0bc2146ba8 100644
--- a/modules/access/ftp.c
+++ b/modules/access/ftp.c
@@ -5,7 +5,7 @@
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr> - original code
- * Rémi Denis-Courmont <rem # videolan.org> - EPSV support
+ * Rémi Denis-Courmont <rem # videolan.org> - EPSV support
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -106,7 +106,7 @@ static int Connect( access_t *p_access, access_sys_t *p_sys )
/* *** Open a TCP connection with server *** */
msg_Dbg( p_access, "waiting for connection..." );
- p_sys->fd_cmd = fd = net_OpenTCP( p_access, p_sys->url.psz_host,
+ p_sys->fd_cmd = fd = net_ConnectTCP( p_access, p_sys->url.psz_host,
p_sys->url.i_port );
if( fd < 0 )
{
@@ -617,7 +617,7 @@ static int ftp_StartStream( access_t *p_access, off_t i_start )
}
msg_Dbg( p_access, "waiting for data connection..." );
- p_sys->fd_data = net_OpenTCP( p_access, psz_ip, i_port );
+ p_sys->fd_data = net_ConnectTCP( p_access, psz_ip, i_port );
if( p_sys->fd_data < 0 )
{
msg_Err( p_access, "failed to connect with server" );
diff --git a/modules/access/http.c b/modules/access/http.c
index f97099a0db08..72d0cd6d3805 100644
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -763,7 +763,7 @@ static int Connect( access_t *p_access, int64_t i_tell )
/* Open connection */
- p_sys->fd = net_OpenTCP( p_access, srv.psz_host, srv.i_port );
+ p_sys->fd = net_ConnectTCP( p_access, srv.psz_host, srv.i_port );
if( p_sys->fd < 0 )
{
msg_Err( p_access, "cannot connect to %s:%d", srv.psz_host, srv.i_port );
diff --git a/modules/access/mms/mmsh.c b/modules/access/mms/mmsh.c
index 05ef85be47fa..738b94405a03 100644
--- a/modules/access/mms/mmsh.c
+++ b/modules/access/mms/mmsh.c
@@ -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 );
@@ -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 */
diff --git a/modules/access/mms/mmstu.c b/modules/access/mms/mmstu.c
index 528c091e61d2..be56c1d17471 100644
--- a/modules/access/mms/mmstu.c
+++ b/modules/access/mms/mmstu.c
@@ -458,7 +458,7 @@ static int MMSOpen( access_t *p_access, vlc_url_t *p_url, int i_proto )
/* *** Open a TCP connection with server *** */
msg_Dbg( p_access, "waiting for connection..." );
- p_sys->i_handle_tcp = net_OpenTCP( p_access, p_url->psz_host, p_url->i_port );
+ p_sys->i_handle_tcp = net_ConnectTCP( p_access, p_url->psz_host, p_url->i_port );
if( p_sys->i_handle_tcp < 0 )
{
msg_Err( p_access, "failed to open a connection (tcp)" );
diff --git a/modules/access/rtsp/access.c b/modules/access/rtsp/access.c
index 0cbcc891b14e..00f32593a274 100644
--- a/modules/access/rtsp/access.c
+++ b/modules/access/rtsp/access.c
@@ -84,7 +84,7 @@ static int RtspConnect( void *p_userdata, char *psz_server, int i_port )
access_sys_t *p_sys = p_access->p_sys;
/* Open connection */
- p_sys->fd = net_OpenTCP( p_access, psz_server, i_port );
+ p_sys->fd = net_ConnectTCP( p_access, psz_server, i_port );
if( p_sys->fd < 0 )
{
msg_Err( p_access, "cannot connect to %s:%d", psz_server, i_port );
diff --git a/modules/access/tcp.c b/modules/access/tcp.c
index 576a77af6073..ed491e5bf4da 100644
--- a/modules/access/tcp.c
+++ b/modules/access/tcp.c
@@ -110,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 )
diff --git a/modules/misc/network/ipv4.c b/modules/misc/network/ipv4.c
index 9a26018be2b5..3a0f46746d55 100644
--- a/modules/misc/network/ipv4.c
+++ b/modules/misc/network/ipv4.c
@@ -444,7 +444,7 @@ static int OpenUDP( vlc_object_t * p_this )
/* set the time-to-live */
int i_ttl = p_socket->i_ttl;
unsigned char ttl;
-
+
/* set the multicast interface */
char * psz_mif_addr = config_GetPsz( p_this, "miface-addr" );
if( psz_mif_addr )
diff --git a/modules/misc/network/ipv6.c b/modules/misc/network/ipv6.c
index b051891261dd..59e64b432001 100644
--- a/modules/misc/network/ipv6.c
+++ b/modules/misc/network/ipv6.c
@@ -300,11 +300,10 @@ static int OpenUDP( vlc_object_t * p_this )
msg_Err( p_this, "failed to join IP multicast group (%s)",
strerror(errno) );
- }
+ }
}
else
{
-
struct ipv6_mreq imr;
int res;
--
GitLab