Variable name cleanup from Dave Mills

bk: 4ca6e30e0mI4UyUQoageJ61lWv7sWQ

diff --git a/ChangeLog b/ChangeLog
index 2c9eff1e51bdc908da07d3bc934baa28be54a545..dc121f7e0a6f4bf2950768ffd4d736700fc7cceb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Variable name cleanup from Dave Mills.
 * [Bug 1657] darwin needs res_9_init, not res_init.
 (4.2.7p58) 2010/09/30 Released by Harlan Stenn <stenn@ntp.org>
 * Clock select bugfix from Dave Mills.

diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index 82355740aeeb2bbe3d219001c0c7ec68785ad2fa..b261c8b34be35a724bb00b9e3dd15826bbc2cf96 100644 (file)
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -2510,12 +2510,12 @@ clock_select(void)
         */
        j = 0;
        for (i = 0; i < nlist; i++) {
-               double  d;
+               double  h;
 
                peer = peers[i];
-               d = root_distance(peer);
-               if (nlist > 1 && (peer->offset + d < low ||
-                   peer->offset - d > high) && !(peer->flags & FLAG_TRUE))
+               h = root_distance(peer);
+               if ((high <= low || peer->offset + h < low ||
+                   peer->offset - h > high) && !(peer->flags & FLAG_TRUE))
                        continue;
 
 #ifdef REFCLOCK