lkml.org 
[lkml]   [2020]   [Sep]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 23/24] select_tut.2: Use MAX(a, b) from <sys/param.h>
Date
Signed-off-by: Alejandro Colomar <colomar.6.4.3@gmail.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
\
 
 \ /
  Last update: 2020-09-10 23:19    [W:1.123 / U:0.428 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site