linux-kernel - [PATCH 23/24] select_tut.2: Use MAX(a, b) from <sys/param.h>

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Thu, 10 Sep 2020 23:13:44 +0200
From:   Alejandro Colomar <colomar.6.4.3@...il.com>
To:     mtk.manpages@...il.com
Cc:     linux-man@...r.kernel.org, linux-kernel@...r.kernel.org,
        Alejandro Colomar <colomar.6.4.3@...il.com>
Subject: [PATCH 23/24] select_tut.2: Use MAX(a, b) from <sys/param.h>

Signed-off-by: Alejandro Colomar <colomar.6.4.3@...il.com>
---
 man2/select_tut.2 | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/man2/select_tut.2 b/man2/select_tut.2
index f683dd49d..d23683d75 100644
--- a/man2/select_tut.2
+++ b/man2/select_tut.2
@@ -354,6 +354,7 @@ from one TCP port to another.
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
+#include <sys/param.h>      /* Definition of MAX(a, b) */
 #include <sys/select.h>
 #include <string.h>
 #include <signal.h>
@@ -364,9 +365,6 @@ from one TCP port to another.
 
 static int forward_port;
 
-#undef max
-#define max(x,y) ((x) > (y) ? (x) : (y))
-
 static int
 listen_socket(int listen_port)
 {
@@ -483,7 +481,7 @@ main(int argc, char *argv[])
         FD_ZERO(&writefds);
         FD_ZERO(&exceptfds);
         FD_SET(h, &readfds);
-        nfds = max(nfds, h);
+        nfds = MAX(nfds, h);
 
         if (fd1 > 0 && buf1_avail < BUF_SIZE)
             FD_SET(fd1, &readfds);
@@ -499,11 +497,11 @@ main(int argc, char *argv[])
 
         if (fd1 > 0) {
             FD_SET(fd1, &exceptfds);
-            nfds = max(nfds, fd1);
+            nfds = MAX(nfds, fd1);
         }
         if (fd2 > 0) {
             FD_SET(fd2, &exceptfds);
-            nfds = max(nfds, fd2);
+            nfds = MAX(nfds, fd2);
         }
 
         ready = select(nfds + 1, &readfds, &writefds, &exceptfds, NULL);
-- 
2.28.0