From afe94b1cfcbf8dae446a54833e34004e168b2c2f Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sun, 21 Feb 2010 18:00:31 +0200 Subject: [PATCH] Remove confusing debug message (fixes #3319), fetch timeout once --- src/network/tcp.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/network/tcp.c b/src/network/tcp.c index eba5594957..adbd4602f5 100644 --- a/src/network/tcp.c +++ b/src/network/tcp.c @@ -146,6 +146,10 @@ int net_Connect( vlc_object_t *p_this, const char *psz_host, int i_port, return -1; } + int timeout = var_InheritInteger (p_this, "ipv4-timeout"); + if (timeout < 0) + timeout = -1; + for( ptr = res; ptr != NULL; ptr = ptr->ai_next ) { int fd = net_Socket( p_this, ptr->ai_family, @@ -158,21 +162,13 @@ int net_Connect( vlc_object_t *p_this, const char *psz_host, int i_port, if( connect( fd, ptr->ai_addr, ptr->ai_addrlen ) ) { - int timeout, val; + int val; if( net_errno != EINPROGRESS && net_errno != EINTR ) { msg_Err( p_this, "connection failed: %m" ); goto next_ai; } - msg_Dbg( p_this, "connection: %m" ); - - timeout = var_CreateGetInteger (p_this, "ipv4-timeout"); - if (timeout < 0) - { - msg_Err( p_this, "invalid negative value for ipv4-timeout" ); - timeout = 0; - } struct pollfd ufd[2] = { { .fd = fd, .events = POLLOUT }, -- 2.39.5