Changeset 11357

Timestamp:

Oct 28, 2010, 11:19:53 PM (12 years ago)

Author:

charles

Message:

(trunk libT) #3681 "tr-lpd.c's lpd_configureSocket() function is redundant" -- fixed.

File:

• trunk/libtransmission/tr-lpd.c (modified) (6 diffs)

trunk/libtransmission/tr-lpd.c

@@ -29 +29 @@
 #include <sys/time.h>
 #include <unistd.h> /* close() */
-#include <fcntl.h> /* fcntl(), O_NONBLOCK */
 #include <ctype.h> /* toupper() */
 #ifdef WIN32
@@ -37 +36 @@
   #include <ws2tcpip.h>
   typedef uint16_t in_port_t;                   /* all missing */
-  extern int fcntl (int fd, int cmd, ...);
-  #define O_NONBLOCK    04000
 #else
   #include <sys/types.h>
@@ -47 +44 @@
 /* third party */
 #include <event.h>
+#include <evutil.h>
 
 /* libT */
@@ -252 +250 @@
 * @} */
 
-
-/**
-* @brief Configures additional capabilities for a socket */
-static int
-lpd_configureSocket( int sock, int add )
-{
-#ifdef WIN32
-    unsigned long flags = 1;
-
-    if (add != O_NONBLOCK)
-        return -1;              /* not supported */
-    if (ioctlsocket(sock, FIONBIO, &flags) == SOCKET_ERROR)
-        return -1;
-#else
-    /* 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;
-#endif
-
-    return add;
-}
-
 /**
 * @brief Initializes Local Peer Discovery for this node
@@ -311 +282 @@
             goto fail;
 
-        /* enable non-blocking operation */
-        if( lpd_configureSocket( lpd_socket, O_NONBLOCK ) < 0 )
+        if( evutil_make_socket_nonblocking( lpd_socket ) < 0 )
             goto fail;
 
@@ -351 +321 @@
             goto fail;
 
-        /* enable non-blocking operation */
-        if( lpd_configureSocket( lpd_socket2, O_NONBLOCK ) < 0 )
+        if( evutil_make_socket_nonblocking( lpd_socket2 ) < 0 )
             goto fail;