From 5ed97a1c040d3ee245a462b2288b83be64efc103 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 30 May 2008 15:43:10 +0000 Subject: [PATCH] refactor out some dead code in net.c, and probably give jhujhiti fits --- libtransmission/net.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/libtransmission/net.c b/libtransmission/net.c index 5b9d5205c..2b5ea0e49 100644 --- a/libtransmission/net.c +++ b/libtransmission/net.c @@ -118,12 +118,12 @@ createSocket( int type, int priority ) return makeSocketNonBlocking( tr_fdSocketCreate( type, priority ) ); } -static int -tr_netOpen( const struct in_addr * addr, tr_port_t port, - int type, int priority ) +int +tr_netOpenTCP( const struct in_addr * addr, tr_port_t port, int priority ) { int s; struct sockaddr_in sock; + const int type = SOCK_STREAM; if( ( s = createSocket( type, priority ) ) < 0 ) { @@ -151,18 +151,13 @@ tr_netOpen( const struct in_addr * addr, tr_port_t port, return s; } - -int -tr_netOpenTCP( const struct in_addr * addr, tr_port_t port, int priority ) -{ - return tr_netOpen( addr, port, SOCK_STREAM, priority ); -} -static int -tr_netBind( int port, int type ) +int +tr_netBindTCP( int port ) { int s; struct sockaddr_in sock; + const int type = SOCK_STREAM; #if defined( SO_REUSEADDR ) || defined( SO_REUSEPORT ) int optval; #endif @@ -192,12 +187,6 @@ tr_netBind( int port, int type ) return s; } -int -tr_netBindTCP( int port ) -{ - return tr_netBind( port, SOCK_STREAM ); -} - int tr_netAccept( int b, struct in_addr * addr, tr_port_t * port ) {