[Git][NTPsec/ntpsec][master] 3 commits: Fix JSON punctuation error.

[Eric S. Raymond]

Eric S. Raymond pushed to branch master at NTPsec / ntpsec


Commits:
729bd7b9 by Eric S. Raymond at 2016-05-14T21:26:55-04:00
Fix JSON punctuation error.

- - - - -
bd2e8201 by Eric S. Raymond at 2016-05-14T21:32:58-04:00
Update misc-options.txt to match ntpd/ntp_loopfilter.c

#define	CLOCK_ALLAN	11	/* Allan intercept (log2 s) */

- - - - -
f88d40de by kuzetsa at 2016-05-14T21:33:37-04:00
order of operations

(2 / 3) * 5   VERSUS   2 / (3 * 5)

Without any parenth the output from:

2 / 3 * 5

Will be the first version...

... at least for C programming.

(Some languages treat the denominator as though there were parenths)

- - - - -


3 changed files:

- docs/includes/misc-options.txt
- ntpd/ntp_loopfilter.c
- ntpdig/main.c


Changes:

=====================================
docs/includes/misc-options.txt
=====================================
--- a/docs/includes/misc-options.txt
+++ b/docs/includes/misc-options.txt
@@ -240,7 +240,7 @@ The variables operate as follows:
 +allan+ _allan_;;
     The argument becomes the new value for the minimum Allan intercept,
     which is a parameter of the PLL/FLL clock discipline algorithm. The
-    value in log2 seconds defaults to 7 (1024 s), which is also the
+    value in log2 seconds defaults to 11 (2048 s), which is also the
     lower limit.
   +dispersion+ _dispersion_;;
     The argument becomes the new value for the dispersion increase rate,


=====================================
ntpd/ntp_loopfilter.c
=====================================
--- a/ntpd/ntp_loopfilter.c
+++ b/ntpd/ntp_loopfilter.c
@@ -701,8 +701,8 @@ local_clock(
 				 */
 				if (sys_poll >= allan_xpt)
 					clock_frequency += (fp_offset -
-					    clock_offset) / max(ULOGTOD(sys_poll),
-					    mu) * CLOCK_FLL;
+					    clock_offset) / (max(ULOGTOD(sys_poll),
+					    mu) * CLOCK_FLL);
 
 				/*
 				 * The PLL frequency gain (numerator) depends on


=====================================
ntpdig/main.c
=====================================
--- a/ntpdig/main.c
+++ b/ntpdig/main.c
@@ -1365,7 +1365,7 @@ handle_pkt(
 		}
 
 		if (opt_json) {
-		    printf("{\"time\"\"%s\",\"offset\":%f,\"precision\":%f,",
+		    printf("{\"time\":\"%s\",\"offset\":%f,\"precision\":%f,",
 		    	ts_str, offset, synch_distance);
 		    printf("\"host\":\"%s\",\"ip\":\"%s\",",
 			   hostname, stoa(host));



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/5fd5d827f9ccb6909608e0e8c8ab57814723fa9e...f88d40de22e9ceef9295bc92f668b258811238cd
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20160515/afd23023/attachment.html>