From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 21 Aug 2011 05:24:12 +0000 (-0400)
Subject: Restore the original CLOCK_MONOTONIC output format in sntp
X-Git-Tag: NTP_4_2_7P207~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a287917c06e4fad9545f29ea4b1a7acfdf851bfb;p=thirdparty%2Fntp.git

Restore the original CLOCK_MONOTONIC output format in sntp

bk: 4e50967cyoWnBU-E_b16Ego1DjxEiA
---

diff --git a/ChangeLog b/ChangeLog
index 84eb031ba..a02437c5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Restore the original CLOCK_MONOTONIC output format in sntp.
 * Cleanups for ntp-wait-opts.def and ntp.keys.def .
 (4.2.7p206) 2011/08/20 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1993] ntpd Windows port adj_systime() broken in 4.2.7p203.
diff --git a/sntp/main.c b/sntp/main.c
index 5b1e11bcd..25227b73b 100644
--- a/sntp/main.c
+++ b/sntp/main.c
@@ -1478,7 +1478,8 @@ gettimeofday_cached(
 			if (labs((long)diff.tv_sec) < 3600) {
 				/* older libevent2 using monotonic */
 				timeval_sub(&offset, &systemt, &mono);
-				TRACE(1, ("%s: Offsetting libevent CLOCK_MONOTONIC times by %.6f\n", progname, offset));
+				TRACE(1, ("%s: Offsetting libevent CLOCK_MONOTONIC times  by %+ld.%06ld\n",
+					 (long)offset.tv_sec, offset.tv_usec));
 			}
 		}
 		offset_ready = TRUE;