Changeset 9810

Timestamp:

Dec 21, 2009, 10:03:19 PM (13 years ago)

Author:

livings124

Message:

avoid an extra comparison caused by macro expansion

File:

• trunk/libtransmission/fdlimit.c (modified) (1 diff)

trunk/libtransmission/fdlimit.c

@@ -833 +833 @@
         const int open_max = sysconf( _SC_OPEN_MAX );
         getrlimit( RLIMIT_NOFILE, &rlim );
-        rlim.rlim_cur = MIN( MAX( 1024, open_max ), rlim.rlim_max );
+        rlim.rlim_cur = MAX( 1024, open_max );
+        rlim.rlim_cur = MIN( rlim.rlim_cur, rlim.rlim_max );
         setrlimit( RLIMIT_NOFILE, &rlim );
         tr_dbg( "setrlimit( RLIMIT_NOFILE, %d )", (int)rlim.rlim_cur );