From 4093665e6b92fed1fdfd7a52262e823de38309f7 Mon Sep 17 00:00:00 2001 From: sheldonh Date: Thu, 22 Jul 1999 16:10:40 +0000 Subject: Remove unnecessary macro introduced in previous commit. Also, the previous commit failed to reference: PR: 12731 Submitted by: dwmalone@maths.tcd.ie (David "Inetd" Malone) --- usr.sbin/inetd/inetd.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'usr.sbin') diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c index 3bbe5f1..ec1a04f 100644 --- a/usr.sbin/inetd/inetd.c +++ b/usr.sbin/inetd/inetd.c @@ -42,7 +42,7 @@ static const char copyright[] = static char sccsid[] = "@(#)from: inetd.c 8.4 (Berkeley) 4/13/94"; #endif static const char rcsid[] = - "$Id: inetd.c,v 1.65 1999/07/22 14:47:29 sheldonh Exp $"; + "$Id: inetd.c,v 1.66 1999/07/22 15:57:37 sheldonh Exp $"; #endif /* not lint */ /* @@ -151,7 +151,6 @@ static const char rcsid[] = ( ((wrap_ex && !(sep)->se_bi) || (wrap_bi && (sep)->se_bi)) \ && ( ((sep)->se_accept && (sep)->se_socktype == SOCK_STREAM) \ || (sep)->se_socktype == SOCK_DGRAM)) -#define LARGEST(x,y) ((x) > (y) ? (x) : (y)) #ifdef LOGIN_CAP #include @@ -367,8 +366,10 @@ main(argc, argv, envp) } FD_SET(signalpipe[0], &allsock); nsock++; - if (signalpipe[0] > maxsock || signalpipe[1] > maxsock) - maxsock = LARGEST(signalpipe[0], signalpipe[1]); + if (signalpipe[0] > maxsock) + maxsock = signalpipe[0]; + if (signalpipe[1] > maxsock) + maxsock = signalpipe[1]; for (;;) { int n, ctrl; -- cgit v1.1