From f04311c2a325493def7c0b2fdab96dbd2c93151a Mon Sep 17 00:00:00 2001
From: bcook <>
Date: Sun, 4 Jan 2015 01:48:49 +0000
Subject: [PATCH] use MAXIMUM as the canonical local MAX macro.

suggested by deraadt@ re: more general MIN/MAX cleanups
---
 src/usr.sbin/ntpd/client.c | 8 +++-----
 src/usr.sbin/ntpd/ntp.c    | 6 ++----
 src/usr.sbin/ntpd/ntpd.h   | 4 +++-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/usr.sbin/ntpd/client.c b/src/usr.sbin/ntpd/client.c
index cca9cbcc..02f0e2f2 100644
--- a/src/usr.sbin/ntpd/client.c
+++ b/src/usr.sbin/ntpd/client.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: client.c,v 1.94 2015/01/04 01:19:46 bcook Exp $ */
+/*	$OpenBSD: client.c,v 1.95 2015/01/04 01:48:49 bcook Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -121,15 +121,13 @@ client_nextaddr(struct ntp_peer *p)
 	return (0);
 }
 
-#define SCALE_MAX(a, b) ((a) > (b) ? (a) : (b))
-
 int
 client_query(struct ntp_peer *p)
 {
 	int	val;
 
 	if (p->addr == NULL && client_nextaddr(p) == -1) {
-		set_next(p, SCALE_MAX(SETTIME_TIMEOUT,
+		set_next(p, MAXIMUM(SETTIME_TIMEOUT,
 		    scale_interval(INTERVAL_QUERY_AGGRESSIVE)));
 		return (0);
 	}
@@ -152,7 +150,7 @@ client_query(struct ntp_peer *p)
 			if (errno == ECONNREFUSED || errno == ENETUNREACH ||
 			    errno == EHOSTUNREACH || errno == EADDRNOTAVAIL) {
 				client_nextaddr(p);
-				set_next(p, SCALE_MAX(SETTIME_TIMEOUT,
+				set_next(p, MAXIMUM(SETTIME_TIMEOUT,
 				    scale_interval(INTERVAL_QUERY_AGGRESSIVE)));
 				return (-1);
 			} else
diff --git a/src/usr.sbin/ntpd/ntp.c b/src/usr.sbin/ntpd/ntp.c
index 25eabe83..f0cafb37 100644
--- a/src/usr.sbin/ntpd/ntp.c
+++ b/src/usr.sbin/ntpd/ntp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntp.c,v 1.123 2015/01/04 01:19:46 bcook Exp $ */
+/*	$OpenBSD: ntp.c,v 1.124 2015/01/04 01:48:49 bcook Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -734,15 +734,13 @@ update_scale(double offset)
 		conf->scale = QSCALE_OFF_MAX / offset;
 }
 
-#define SCALE_MAX(a, b) ((a) > (b) ? (a) : (b))
-
 time_t
 scale_interval(time_t requested)
 {
 	time_t interval, r;
 
 	interval = requested * conf->scale;
-	r = arc4random_uniform(SCALE_MAX(5, interval / 10));
+	r = arc4random_uniform(MAXIMUM(5, interval / 10));
 	return (interval + r);
 }
 
diff --git a/src/usr.sbin/ntpd/ntpd.h b/src/usr.sbin/ntpd/ntpd.h
index 6978ea6f..5db89282 100644
--- a/src/usr.sbin/ntpd/ntpd.h
+++ b/src/usr.sbin/ntpd/ntpd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntpd.h,v 1.112 2015/01/04 01:13:10 bcook Exp $ */
+/*	$OpenBSD: ntpd.h,v 1.113 2015/01/04 01:48:49 bcook Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -33,6 +33,8 @@
 #include "ntp.h"
 #include <imsg.h>
 
+#define MAXIMUM(a, b)	((a) > (b) ? (a) : (b))
+
 #define	NTPD_USER	"_ntp"
 #define	CONFFILE	"/etc/ntpd.conf"
 #define DRIFTFILE	"/var/db/ntpd.drift"