Changeset 3105 for trunk/libtransmission/fdlimit.c

Timestamp:

Sep 20, 2007, 4:32:01 PM (15 years ago)

Author:

livings124

Message:

merge encryption branch to trunk (xcode project is still out of date)

File:

• trunk/libtransmission/fdlimit.c (modified) (2 diffs)

trunk/libtransmission/fdlimit.c

@@ -64 +64 @@
 typedef struct tr_fd_s
 {
-    tr_lock_t     * lock;
-    tr_cond_t     * cond;
+    tr_lock       * lock;
+    tr_cond       * cond;
     
     int             reserved;
@@ -391 +391 @@
 void tr_fdSocketClose( int s )
 {
-    tr_lockLock( gFd->lock );
+    if( s >= 0 )
+    {
+        tr_lockLock( gFd->lock );
 #ifdef BEOS_NETSERVER
-    closesocket( s );
+        closesocket( s );
 #else
-    close( s );
+        close( s );
 #endif
-    if( SocketGetPriority( s ) )
-        gFd->reserved--;
-    else
-        gFd->normal--;
-    tr_lockUnlock( gFd->lock );
+        if( SocketGetPriority( s ) )
+            gFd->reserved--;
+        else
+            gFd->normal--;
+        tr_lockUnlock( gFd->lock );
+    }
 }