[Git][NTPsec/ntpsec][master] More OS X wraning fixes (mostly generivc to non-PLL systems).

[Eric S. Raymond]

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


Commits:
1d022f59 by Eric S. Raymond at 2015-11-23T09:59:46Z
More OS X wraning fixes (mostly generivc to non-PLL systems).

- - - - -


2 changed files:

- ntpd/ntp_loopfilter.c
- tests/libntp/tstotv.c


Changes:

=====================================
ntpd/ntp_loopfilter.c
=====================================
--- a/ntpd/ntp_loopfilter.c
+++ b/ntpd/ntp_loopfilter.c
@@ -1064,12 +1064,12 @@ set_freq(
 	)
 {
 	const char *	loop_desc;
-	int ntp_adj_ret;
 
 	drift_comp = freq;
 	loop_desc = "ntpd";
 #ifdef HAVE_KERNEL_PLL
 	if (pll_control) {
+		int ntp_adj_ret;
 		ZERO(ntv);
 		ntv.modes = MOD_FREQUENCY;
 		if (kern_enable) {


=====================================
tests/libntp/tstotv.c
=====================================
--- a/tests/libntp/tstotv.c
+++ b/tests/libntp/tstotv.c
@@ -19,9 +19,9 @@ static bool IsEqual(const struct timeval *expected, const struct timeval *actual
 		// Success
 		return true;
 	} else {
-		/* long cast iscrequired on Darwin */
+		/* long cast is required on Darwin */
 		printf("Expected: %ld.%ld but was %ld.%ld\n",
-		       expected->tv_sec, expected->tv_usec,
+		       expected->tv_sec, (long)expected->tv_usec,
 		       actual->tv_sec, (long)actual->tv_usec);
 		return false;
 	}



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/1d022f59ef9dd76450af234189366952ef564897
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20151123/1f47f993/attachment.html>