From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 24 Aug 2011 07:50:28 +0000 (-0400)
Subject: Fix the CLOCK_MONOTONIC TRACE() message
X-Git-Tag: NTP_4_2_7P208~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0254f14f1116062e665aa4e3e56b636e9e710932;p=thirdparty%2Fntp.git

Fix the CLOCK_MONOTONIC TRACE() message

bk: 4e54ad44gvl50Bk8aFZNLcKwHj3edw
---

diff --git a/ChangeLog b/ChangeLog
index 601963025..de0eea3fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Fix the CLOCK_MONOTONIC TRACE() message.
 (4.2.7p207) 2011/08/22 Released by Harlan Stenn <stenn@ntp.org>
 * Restore the original CLOCK_MONOTONIC output format in sntp.
 * Cleanups for ntp-wait-opts.def and ntp.keys.def .
diff --git a/sntp/main.c b/sntp/main.c
index 25227b73b..01ee9e13c 100644
--- a/sntp/main.c
+++ b/sntp/main.c
@@ -729,7 +729,7 @@ void dec_pending_ntp(
 		check_exit_conditions();
 	} else {
 		INSIST(0 == n_pending_ntp);
-		TRACE(1, ("n_pending_ntp reached zero before dec for %s\n",
+		TRACE(1, ("n_pending_ntp was zero before decrement for %s\n",
 			  hostnameaddr(name, server)));
 	}
 }
@@ -1479,6 +1479,7 @@ gettimeofday_cached(
 				/* older libevent2 using monotonic */
 				timeval_sub(&offset, &systemt, &mono);
 				TRACE(1, ("%s: Offsetting libevent CLOCK_MONOTONIC times  by %+ld.%06ld\n",
+					 "gettimeofday_cached",
 					 (long)offset.tv_sec, offset.tv_usec));
 			}
 		}