From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 29 Dec 2015 18:08:22 +0000 (+0100)
Subject: resolved: use CLAMP() intsead of MIN(MAX())
X-Git-Tag: v229~180^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=efd46a696d31097c38f653b36921e00c4df62319;p=thirdparty%2Fsystemd.git

resolved: use CLAMP() intsead of MIN(MAX())
---

diff --git a/src/resolve/resolved-dns-server.c b/src/resolve/resolved-dns-server.c
index a57385d47df..fbd1c27c147 100644
--- a/src/resolve/resolved-dns-server.c
+++ b/src/resolve/resolved-dns-server.c
@@ -253,7 +253,7 @@ void dns_server_packet_received(DnsServer *s, DnsServerFeatureLevel level, usec_
 
         if (s->max_rtt < rtt) {
                 s->max_rtt = rtt;
-                s->resend_timeout = MIN(MAX(DNS_TIMEOUT_MIN_USEC, s->max_rtt * 2), DNS_TIMEOUT_MAX_USEC);
+                s->resend_timeout = CLAMP(s->max_rtt * 2, DNS_TIMEOUT_MIN_USEC, DNS_TIMEOUT_MAX_USEC);
         }
 }