Changeset 11473 for branches

Timestamp:

Dec 5, 2010, 6:47:39 PM (11 years ago)

Author:

charles

Message:

(2.0x libtransmission) backport r11357 for #3681 "tr-lpd.c's lpd_configureSocket() function is redundant"

File:

• branches/2.0x/libtransmission/tr-lpd.c (modified) (4 diffs)

branches/2.0x/libtransmission/tr-lpd.c

@@ -32 +32 @@
 #include <sys/socket.h> /* socket(), bind() */
 #include <unistd.h> /* close() */
-#include <fcntl.h> /* fcntl(), O_NONBLOCK */
 #include <ctype.h> /* toupper() */
 
 /* third party */
 #include <event.h>
+#include <evutil.h>
 
 /* libT */
@@ -244 +244 @@
 
 /**
-* @brief Configures additional capabilities for a socket */
-static inline int lpd_configureSocket( int sock, int add )
-{
-    /* read-modify-write socket flags */
-    int flags = fcntl( sock, F_GETFL );
-
-    if( flags < 0 )
-        return -1;
-
-    if( fcntl( sock, F_SETFL, add | flags ) == -1 )
-        return -1;
-
-    return add;
-}
-
-/**
 * @brief Initializes Local Peer Discovery for this node
 *
@@ -292 +276 @@
 
         /* enable non-blocking operation */
-        if( lpd_configureSocket( lpd_socket, O_NONBLOCK ) < 0 )
+        if( evutil_make_socket_nonblocking( lpd_socket ) < 0 ) 
             goto fail;
 
@@ -332 +316 @@
 
         /* enable non-blocking operation */
-        if( lpd_configureSocket( lpd_socket2, O_NONBLOCK ) < 0 )
+        if( evutil_make_socket_nonblocking( lpd_socket2 ) < 0 ) 
             goto fail;