avoid an extra comparison caused by macro expansion

diff --git a/libtransmission/fdlimit.c b/libtransmission/fdlimit.c
index 10c4456a49c25d137893f2500b879dec59249560..974de8af7aed16eaf219e9d066fa921c2c4da5ac 100644 (file)
--- a/libtransmission/fdlimit.c
+++ b/libtransmission/fdlimit.c
@@ -832,7 +832,8 @@ tr_fdSetPeerLimit( tr_session * session, int socketLimit )
         const int NOFILE_BUFFER = 512;
         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 );
         gFd->socketLimit = MIN( socketLimit, (int)rlim.rlim_cur - NOFILE_BUFFER );