Changeset 9339

Timestamp:

Oct 20, 2009, 8:19:41 PM (13 years ago)

Author:

charles

Message:

(trunk libT) #1483: fix bug introduced in r9328

File:

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

trunk/libtransmission/fdlimit.c

@@ -388 +388 @@
                     tr_bool          doWrite )
 {
-    int i;
-    struct tr_openfile * o;
+    struct tr_openfile * match = NULL;
 
     assert( torrentId > 0 );
@@ -395 +394 @@
 
     /* is it already open? */
-    for( i=0; i<gFd->openFileLimit; ++i )
-    {
-        o = &gFd->openFiles[i];
-
-        if( !fileIsOpen( o ) )
-            continue;
-        if( torrentId != o->torrentId )
-            continue;
-        if( fileNum != o->fileNum )
-            continue;
-
-        break;
-    }
-
-    if( ( o != NULL ) && ( !doWrite || o->isWritable ) )
-    {
-        o->date = tr_date( );
-        return o->fd;
+    {
+        int i;
+        struct tr_openfile * o;
+        for( i=0; i<gFd->openFileLimit; ++i )
+        {
+            o = &gFd->openFiles[i];
+
+            if( torrentId != o->torrentId )
+                continue;
+            if( fileNum != o->fileNum )
+                continue;
+            if( !fileIsOpen( o ) )
+                continue;
+
+            match = o;
+            break;
+        }
+    }
+
+    if( ( match != NULL ) && ( !doWrite || match->isWritable ) )
+    {
+        match->date = tr_date( );
+        return match->fd;
     }
 
@@ -445 +449 @@
         o = &gFd->openFiles[i];
 
-        if( !fileIsOpen( o ) )
-            continue;
         if( torrentId != o->torrentId )
             continue;
         if( fileNum != o->fileNum )
+            continue;
+        if( !fileIsOpen( o ) )
             continue;
 
@@ -529 +533 @@
     for( o=gFd->openFiles, end=o+gFd->openFileLimit; o!=end; ++o )
     {
-        if( !fileIsOpen( o ) )
-            continue;
         if( torrentId != o->torrentId )
             continue;
         if( fileNum != o->fileNum )
             continue;
+        if( !fileIsOpen( o ) )
+            continue;
 
         dbgmsg( "tr_fdFileClose closing \"%s\"", o->filename );
@@ -548 +552 @@
 
     for( o=gFd->openFiles, end=o+gFd->openFileLimit; o!=end; ++o )
-        if( fileIsOpen( o ) && o->torrentId == torrentId )
+        if( fileIsOpen( o ) && ( o->torrentId == torrentId ) )
             TrCloseFile( o );
 }