Wed Feb 1 20:48:02 2012 UTC ()

back to WARNS=4 (constify and signedness corrections)


(kardel)

diff -r1.10 -r1.11 src/external/bsd/ntp/Makefile.inc
diff -r1.5 -r1.6 src/external/bsd/ntp/dist/ntpd/ntp_control.c
diff -r1.7 -r1.8 src/external/bsd/ntp/dist/ntpd/ntp_io.c
diff -r1.3 -r1.4 src/external/bsd/ntp/dist/ntpd/ntp_refclock.c
diff -r1.3 -r1.4 src/external/bsd/ntp/dist/ntpd/refclock_jjy.c
diff -r1.1.1.2 -r1.2 src/external/bsd/ntp/dist/ntpd/ntp_restrict.c
diff -r1.4 -r1.5 src/external/bsd/ntp/dist/ntpq/ntpq.c
diff -r1.3 -r1.4 src/external/bsd/ntp/dist/sntp/crypto.c
diff -r1.3 -r1.4 src/external/bsd/ntp/dist/sntp/main.c
diff -r1.3 -r1.4 src/external/bsd/ntp/dist/sntp/networking.h
diff -r1.4 -r1.5 src/external/bsd/ntp/dist/sntp/log.c
diff -r1.5 -r1.6 src/external/bsd/ntp/dist/sntp/networking.c
diff -r1.1.1.2 -r1.2 src/external/bsd/ntp/dist/sntp/libopts/numeric.c
diff -r1.3 -r1.4 src/external/bsd/ntp/dist/sntp/libopts/autoopts/options.h
diff -r1.3 -r1.4 src/external/bsd/ntp/dist/util/ntp-keygen-opts.c

--- src/external/bsd/ntp/Makefile.inc 2012/02/01 07:46:20	1.10
+++ src/external/bsd/ntp/Makefile.inc 2012/02/01 20:48:01	1.11

 @@ -1,27 +1,27 @@
-#	$NetBSD: Makefile.inc,v 1.10 2012/02/01 07:46:20 kardel Exp $
+#	$NetBSD: Makefile.inc,v 1.11 2012/02/01 20:48:01 kardel Exp $
 .if !defined(NTP_MAKEFILE_INC)
 NTP_MAKEFILE_INC=yes
 USE_FORT?= yes	# network client/server
 CWARNFLAGS+=	-Wno-missing-noreturn
 CWARNFLAGS.clang+=	-Wno-unneeded-internal-declaration \
 			-Wno-format-security \
 			-Wno-parentheses -Wno-constant-logical-operand
-#WARNS?=	4
+WARNS?=	4
 WARNS?=	0
 .include <bsd.own.mk>
 IDIST=		${NETBSDSRCDIR}/external/bsd/ntp/dist
 NTP_SRCDIR=	${NETBSDSRCDIR}/external/bsd/ntp
 NTP_HTMLDIR=	/usr/share/doc/html/ntp
 SYSCONFDIR=/etc
 LOCALSTATEDIR=/var
 CPPFLAGS+=-DHAVE_CONFIG_H
 CPPFLAGS+=-I${NTP_SRCDIR}/include \
 	  -I${IDIST}/include \

--- src/external/bsd/ntp/dist/ntpd/ntp_control.c 2012/02/01 07:46:22	1.5
+++ src/external/bsd/ntp/dist/ntpd/ntp_control.c 2012/02/01 20:48:01	1.6

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ntp_control.c,v 1.5 2012/02/01 07:46:22 kardel Exp $	*/
+/*	$NetBSD: ntp_control.c,v 1.6 2012/02/01 20:48:01 kardel Exp $	*/
 /*
  * ntp_control.c - respond to control messages and send async traps
  */
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_refclock.h"
 #include "ntp_control.h"
 @@ -690,31 +690,31 @@ process_control(
 	/*
 	 * Save the addresses for error responses
 	 */
 	numctlreq++;
 	rmt_addr = &rbufp->recv_srcadr;
 	lcl_inter = rbufp->dstadr;
 	pkt = (struct ntp_control *)&rbufp->recv_pkt;
 	/*
 	 * If the length is less than required for the header, or
 	 * it is a response or a fragment, ignore this.
 	 */
-	if (rbufp->recv_length < CTL_HEADER_LEN
+	if (rbufp->recv_length < (int)CTL_HEADER_LEN
 	    || pkt->r_m_e_op & (CTL_RESPONSE|CTL_MORE|CTL_ERROR)
 	    || pkt->offset != 0) {
 		DPRINTF(1, ("invalid format in control packet\n"));
-		if (rbufp->recv_length < CTL_HEADER_LEN)
+		if (rbufp->recv_length < (int)CTL_HEADER_LEN)
 			numctltooshort++;
 		if (pkt->r_m_e_op & CTL_RESPONSE)
 			numctlinputresp++;
 		if (pkt->r_m_e_op & CTL_MORE)
 			numctlinputfrag++;
 		if (pkt->r_m_e_op & CTL_ERROR)
 			numctlinputerr++;
 		if (pkt->offset != 0)
 			numctlbadoffset++;
 		return;
+	}
 	res_version = PKT_VERSION(pkt->li_vn_mode);
 	if (res_version > NTP_VERSION || res_version < NTP_OLDVERSION) {
 @@ -1072,52 +1072,52 @@ ctl_putdbl(
 	const char *tag,
 	double ts
+	)
+{
 	register char *cp;
 	register const char *cq;
 	char buffer[200];
 	cp = buffer;
 	cq = tag;
 	while (*cq != '\0')
 		*cp++ = *cq++;
 	*cp++ = '=';
-	NTP_INSIST((cp - buffer) < sizeof(buffer));
+	NTP_INSIST((cp - buffer) < (int)sizeof(buffer));
 	snprintf(cp, sizeof(buffer) - (cp - buffer), "%.3f", ts);
 	cp += strlen(cp);
 	ctl_putdata(buffer, (unsigned)(cp - buffer), 0);
+}
 /*
  * ctl_putuint - write a tagged unsigned integer into the response
  */
 static void
 ctl_putuint(
 	const char *tag,
 	u_long uval
+	)
+{
 	register char *cp;
 	register const char *cq;
 	char buffer[200];
 	cp = buffer;
 	cq = tag;
 	while (*cq != '\0')
 		*cp++ = *cq++;
 	*cp++ = '=';
-	NTP_INSIST((cp - buffer) < sizeof(buffer));
+	NTP_INSIST((cp - buffer) < (int)sizeof(buffer));
 	snprintf(cp, sizeof(buffer) - (cp - buffer), "%lu", uval);
 	cp += strlen(cp);
 	ctl_putdata(buffer, (unsigned)( cp - buffer ), 0);
+}
 /*
  * ctl_putfs - write a decoded filestamp into the response
  */
 static void
 ctl_putfs(
 	const char *tag,
 	tstamp_t uval
+	)
 @@ -1128,27 +1128,27 @@ ctl_putfs(
 	struct tm *tm = NULL;
 	time_t fstamp;
 	cp = buffer;
 	cq = tag;
 	while (*cq != '\0')
 		*cp++ = *cq++;
 	*cp++ = '=';
 	fstamp = uval - JAN_1970;
 	tm = gmtime(&fstamp);
 	if (NULL ==  tm)
 		return;
-	NTP_INSIST((cp - buffer) < sizeof(buffer));
+	NTP_INSIST((cp - buffer) < (int)sizeof(buffer));
 	snprintf(cp, sizeof(buffer) - (cp - buffer),
 		 "%04d%02d%02d%02d%02d", tm->tm_year + 1900,
 		 tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min);
 	cp += strlen(cp);
 	ctl_putdata(buffer, (unsigned)( cp - buffer ), 0);
+}
 /*
  * ctl_puthex - write a tagged unsigned integer, in hex, into the
  * response
  */
 static void
 @@ -1157,79 +1157,79 @@ ctl_puthex(
 	u_long uval
+	)
+{
 	register char *cp;
 	register const char *cq;
 	char buffer[200];
 	cp = buffer;
 	cq = tag;
 	while (*cq != '\0')
 		*cp++ = *cq++;
 	*cp++ = '=';
-	NTP_INSIST((cp - buffer) < sizeof(buffer));
+	NTP_INSIST((cp - buffer) < (int)sizeof(buffer));
 	snprintf(cp, sizeof(buffer) - (cp - buffer), "0x%lx", uval);
 	cp += strlen(cp);
 	ctl_putdata(buffer,(unsigned)( cp - buffer ), 0);
+}
 /*
  * ctl_putint - write a tagged signed integer into the response
  */
 static void
 ctl_putint(
 	const char *tag,
 	long ival
+	)
+{
 	register char *cp;
 	register const char *cq;
 	char buffer[200];
 	cp = buffer;
 	cq = tag;
 	while (*cq != '\0')
 		*cp++ = *cq++;
 	*cp++ = '=';
-	NTP_INSIST((cp - buffer) < sizeof(buffer));
+	NTP_INSIST((cp - buffer) < (int)sizeof(buffer));
 	snprintf(cp, sizeof(buffer) - (cp - buffer), "%ld", ival);
 	cp += strlen(cp);
 	ctl_putdata(buffer, (unsigned)( cp - buffer ), 0);
+}
 /*
  * ctl_putts - write a tagged timestamp, in hex, into the response
  */
 static void
 ctl_putts(
 	const char *tag,
 	l_fp *ts
+	)
+{
 	register char *cp;
 	register const char *cq;
 	char buffer[200];
 	cp = buffer;
 	cq = tag;
 	while (*cq != '\0')
 		*cp++ = *cq++;
 	*cp++ = '=';
-	NTP_INSIST((cp - buffer) < sizeof(buffer));
+	NTP_INSIST((cp - buffer) < (int)sizeof(buffer));
 	snprintf(cp, sizeof(buffer) - (cp - buffer), "0x%08lx.%08lx",
 		 ts->l_ui & 0xffffffffUL, ts->l_uf & 0xffffffffUL);
 	cp += strlen(cp);
 	ctl_putdata(buffer, (unsigned)( cp - buffer ), 0);
+}
 /*
  * ctl_putadr - write an IP address into the response
  */
 static void
 ctl_putadr(
 	const char *tag,
 @@ -1241,27 +1241,27 @@ ctl_putadr(
 	register const char *cq;
 	char buffer[200];
 	cp = buffer;
 	cq = tag;
 	while (*cq != '\0')
 		*cp++ = *cq++;
 	*cp++ = '=';
 	if (NULL == addr)
 		cq = numtoa(addr32);
 	else
 		cq = stoa(addr);
-	NTP_INSIST((cp - buffer) < sizeof(buffer));
+	NTP_INSIST((cp - buffer) < (int)sizeof(buffer));
 	snprintf(cp, sizeof(buffer) - (cp - buffer), "%s", cq);
 	cp += strlen(cp);
 	ctl_putdata(buffer, (unsigned)(cp - buffer), 0);
+}
 /*
  * ctl_putrefid - send a u_int32 refid as printable text
  */
 static void
 ctl_putrefid(
 	const char *	tag,
 	u_int32		refid
 @@ -1278,27 +1278,27 @@ ctl_putrefid(
 	oplim = output + sizeof(output);
 	while (optr < oplim && '\0' != *tag)
 		*optr++ = *tag++;
 	if (optr < oplim) {
 		*optr++ = '=';
 		past_eq = optr;
+	}
 	if (!(optr < oplim))
 		return;
 	iptr = (char *)&refid;
 	iplim = iptr + sizeof(refid);
 	for ( ; optr < oplim && iptr < iplim && '\0' != *iptr;
 	     iptr++, optr++)
-		if (isprint(*iptr))
+		if (isprint((int)*iptr))
 			*optr = *iptr;
 		else
 			*optr = '.';
 	if (!(optr <= oplim))
 		optr = past_eq;
 	ctl_putdata(output, (u_int)(optr - output), FALSE);
+}
 /*
  * ctl_putarray - write a tagged eight element double array into the response
  */
 static void
 @@ -1311,27 +1311,27 @@ ctl_putarray(
 	register char *cp;
 	register const char *cq;
 	char buffer[200];
 	int i;
 	cp = buffer;
 	cq = tag;
 	while (*cq != '\0')
 		*cp++ = *cq++;
 	i = start;
 	do {
 		if (i == 0)
 			i = NTP_SHIFT;
 		i--;
-		NTP_INSIST((cp - buffer) < sizeof(buffer));
+		NTP_INSIST((cp - buffer) < (int)sizeof(buffer));
 		snprintf(cp, sizeof(buffer) - (cp - buffer),
 			 " %.2f", arr[i] * 1e3);
 		cp += strlen(cp);
 	} while(i != start);
 	ctl_putdata(buffer, (unsigned)(cp - buffer), 0);
+}
 /*
  * ctl_putsys - output a system variable
  */
 static void
 ctl_putsys(

--- src/external/bsd/ntp/dist/ntpd/ntp_io.c 2012/02/01 07:46:22	1.7
+++ src/external/bsd/ntp/dist/ntpd/ntp_io.c 2012/02/01 20:48:01	1.8

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ntp_io.c,v 1.7 2012/02/01 07:46:22 kardel Exp $	*/
+/*	$NetBSD: ntp_io.c,v 1.8 2012/02/01 20:48:01 kardel Exp $	*/
 /*
  * ntp_io.c - input/output routines for ntpd.	The socket-opening code
  *		   was shamelessly stolen from ntpd.
  */
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 #include <stdio.h>
 #include <signal.h>
 #ifdef HAVE_SYS_PARAM_H
 @@ -199,27 +199,27 @@ static	isc_boolean_t	is_anycast		(sockad
 						 const char *);
 /*
  * Not all platforms support multicast
  */
 #ifdef MCAST
 static	isc_boolean_t	socket_multicast_enable	(endpt *, sockaddr_u *);
 static	isc_boolean_t	socket_multicast_disable(endpt *, sockaddr_u *);
 #endif
 #ifdef DEBUG
 static void interface_dump	(const endpt *);
 static void sockaddr_dump	(const sockaddr_u *);
-static void print_interface	(const endpt *, char *, char *);
+static void print_interface	(const endpt *, const char *, const char *);
 #define DPRINT_INTERFACE(level, args) do { if (debug >= (level)) { print_interface args; } } while (0)
 #else
 #define DPRINT_INTERFACE(level, args) do {} while (0)
 #endif
 typedef struct vsock vsock_t;
 enum desc_type { FD_TYPE_SOCKET, FD_TYPE_FILE };
 struct vsock {
 	vsock_t	*	link;
 	SOCKET		fd;
 	enum desc_type	type;
 };
 @@ -613,27 +613,27 @@ sockaddr_dump(const sockaddr_u *psau)
 	for(i = 0; i < maxsize; i++) {
 		printf("%02x", *cp++);
 		if (!((i + 1) % 4))
 			printf(" ");
+	}
 	printf("\n");
+}
 /*
  * print_interface - helper to output debug information
  */
 static void
-print_interface(const endpt *iface, char *pfx, char *sfx)
+print_interface(const endpt *iface, const char *pfx, const char *sfx)
+{
 	printf("%sinterface #%d: fd=%d, bfd=%d, name=%s, flags=0x%x, ifindex=%u, sin=%s",
 	       pfx,
 	       iface->ifnum,
 	       iface->fd,
 	       iface->bfd,
 	       iface->name,
 	       iface->flags,
 	       iface->ifindex,
 	       stoa(&iface->sin));
 	if (AF_INET == iface->family) {
 		if (iface->flags & INT_BROADCAST)
 			printf(", bcast=%s", stoa(&iface->bcast));
 @@ -3855,27 +3855,27 @@ calc_addr_distance(
 	if (IS_IPV4(a1)) {
 		a1val = SRCADR(a1);
 		a2val = SRCADR(a2);
 		v4dist = (a1val > a2val)
 			     ? a1val - a2val
 			     : a2val - a1val;
 		SET_ADDR4(dist, v4dist);
 		return;
+	}
 	found_greater = FALSE;
 	a1_greater = FALSE;	/* suppress pot. uninit. warning */
-	for (i = 0; i < sizeof(NSRCADR6(a1)); i++) {
+	for (i = 0; i < (int)sizeof(NSRCADR6(a1)); i++) {
 		if (!found_greater &&
 		    NSRCADR6(a1)[i] != NSRCADR6(a2)[i]) {
 			found_greater = TRUE;
 			a1_greater = (NSRCADR6(a1)[i] > NSRCADR6(a2)[i]);
+		}
 		if (!found_greater) {
 			NSRCADR6(dist)[i] = 0;
 		} else {
 			if (a1_greater)
 				NSRCADR6(dist)[i] = NSRCADR6(a1)[i] -
 						    NSRCADR6(a2)[i];
 			else
 				NSRCADR6(dist)[i] = NSRCADR6(a2)[i] -
 @@ -3898,27 +3898,27 @@ cmp_addr_distance(
 	int	i;
 	NTP_REQUIRE(AF(d1) == AF(d2));
 	if (IS_IPV4(d1)) {
 		if (SRCADR(d1) < SRCADR(d2))
 			return -1;
 		else if (SRCADR(d1) == SRCADR(d2))
 			return 0;
 		else
 			return 1;
+	}
-	for (i = 0; i < sizeof(NSRCADR6(d1)); i++) {
+	for (i = 0; i < (int)sizeof(NSRCADR6(d1)); i++) {
 		if (NSRCADR6(d1)[i] < NSRCADR6(d2)[i])
 			return -1;
 		else if (NSRCADR6(d1)[i] > NSRCADR6(d2)[i])
 			return 1;
+	}
 	return 0;
+}
 /*
  * fetch an interface structure the matches the

--- src/external/bsd/ntp/dist/ntpd/ntp_refclock.c 2012/02/01 07:46:22	1.3
+++ src/external/bsd/ntp/dist/ntpd/ntp_refclock.c 2012/02/01 20:48:01	1.4

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ntp_refclock.c,v 1.3 2012/02/01 07:46:22 kardel Exp $	*/
+/*	$NetBSD: ntp_refclock.c,v 1.4 2012/02/01 20:48:01 kardel Exp $	*/
 /*
  * ntp_refclock - processing support for reference clocks
  */
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_unixtime.h"
 #include "ntp_tty.h"
 #include "ntp_refclock.h"
 @@ -504,27 +504,27 @@ refclock_sample(
 	pp->offset = 0;
 	pp->jitter = 0;
 	for (k = i; k < j; k++) {
 		pp->offset += off[k];
 		if (k > i)
 			pp->jitter += SQUARE(off[k] - off[k - 1]);
+	}
 	pp->offset /= m;
 	pp->jitter = max(SQRT(pp->jitter / m), LOGTOD(sys_precision));
 #ifdef DEBUG
 	if (debug)
 		printf(
 		    "refclock_sample: n %d offset %.6f disp %.6f jitter %.6f\n",
-		    n, pp->offset, pp->disp, pp->jitter);
+		    (int)n, pp->offset, pp->disp, pp->jitter);
 #endif
 	return (int)n;
+}
 /*
  * refclock_receive - simulate the receive and packet procedures
+ *
  * This routine simulates the NTP receive and packet procedures for a
  * reference clock. This provides a mechanism in which the ordinary NTP
  * filter, selection and combining algorithms can be used to suppress
  * misbehaving radios and to mitigate between them when more than one is
  * available for backup.

--- src/external/bsd/ntp/dist/ntpd/refclock_jjy.c 2012/02/01 07:46:22	1.3
+++ src/external/bsd/ntp/dist/ntpd/refclock_jjy.c 2012/02/01 20:48:01	1.4

 @@ -1,14 +1,14 @@
-/*	$NetBSD: refclock_jjy.c,v 1.3 2012/02/01 07:46:22 kardel Exp $	*/
+/*	$NetBSD: refclock_jjy.c,v 1.4 2012/02/01 20:48:01 kardel Exp $	*/
 /*
  * refclock_jjy - clock driver for JJY receivers
  */
 /**********************************************************************/
 /*								      */
 /*  Copyright (C) 2001-2004, Takao Abe.  All rights reserved.	      */
 /*								      */
 /*  Permission to use, copy, modify, and distribute this software     */
 /*  and its documentation for any purpose is hereby granted	      */
 /*  without fee, provided that the following conditions are met:      */
 /*								      */
 @@ -262,29 +262,29 @@ struct	refclock refclock_jjy = {
 #define	TS_JJY01_REPLY_STUS_NO		"unadjusted\r\n"
 #define	TS_JJY01_REPLY_DCST_VALID	"valid\r\n"
 #define	TS_JJY01_REPLY_DCST_INVALID	"invalid\r\n"
 #define	TS_JJY01_REPLY_LENGTH_DATE	    14	/* Length without <CR><LF> */
 #define	TS_JJY01_REPLY_LENGTH_STIM	    8	/* Length without <CR><LF> */
 #define	TS_JJY01_REPLY_LENGTH_STUS_YES	    8	/* Length without <CR><LF> */
 #define	TS_JJY01_REPLY_LENGTH_STUS_NO	    10	/* Length without <CR><LF> */
 #define	TS_JJY01_REPLY_LENGTH_DCST_VALID    5	/* Length without <CR><LF> */
 #define	TS_JJY01_REPLY_LENGTH_DCST_INVALID  7	/* Length without <CR><LF> */
 static  struct
+{
-	char	commandNumber ;
+	const char	commandNumber ;
-	char	*commandLog ;
+	const char	*commandLog ;
-	char	*command ;
+	const char	*command ;
 	int	commandLength ;
 } tristate_jjy01_command_sequence[] =
+{
 	/* dcst<CR><LF> -> VALID<CR><LF> or INVALID<CR><LF> */
 	{ TS_JJY01_COMMAND_NUMBER_DCST, "dcst", "dcst\r\n", 6 },
 	/* stus<CR><LF> -> ADJUSTED<CR><LF> or UNADJUSTED<CR><LF> */
 	{ TS_JJY01_COMMAND_NUMBER_STUS, "stus", "stus\r\n", 6 },
 	/* date<CR><LF> -> YYYY/MM/DD WWW<CR><LF> */
 	{ TS_JJY01_COMMAND_NUMBER_DATE, "date", "date\r\n", 6 },
 	/* stim<CR><LF> -> HH:MM:SS<CR><LF> */
 	{ TS_JJY01_COMMAND_NUMBER_STIM, "stim", "stim\r\n", 6 },
 	{ 0			      , NULL  , NULL	  , 0 }
 } ;
 @@ -643,41 +643,41 @@ jjy_receive ( struct recvbuf *rbufp )
+	}
 	pp->lastref = pp->lastrec;
 	refclock_receive(peer);
+}
 /**************************************************************************************************/
 static int
 jjy_receive_tristate_jjy01 ( struct recvbuf *rbufp )
+{
-	static	char	*sFunctionName = "jjy_receive_tristate_jjy01" ;
+	static	const char	*sFunctionName = "jjy_receive_tristate_jjy01" ;
 	struct jjyunit	    *up ;
 	struct refclockproc *pp ;
 	struct peer	    *peer;
 	char	*pBuf ;
 	int 	iLen ;
 	int 	rc ;
 	int 	bOverMidnight = 0 ;
 	char	sLogText [ MAX_LOGTEXT ], sReplyText  [ MAX_LOGTEXT ] ;
-	char	*pCmd ;
+	const char *pCmd ;
 	int 	iCmdLen ;
 	/*
 	 * Initialize pointers and read the timecode and timestamp
 	 */
 	peer = (struct peer *) rbufp->recv_srcclock ;
 	pp = peer->procptr ;
 	up = (struct jjyunit *) pp->unitptr ;
 	if ( up->linediscipline == LDISC_RAW ) {
 		pBuf = up->rawbuf ;
 		iLen = up->charcount ;
 	} else {
 @@ -831,27 +831,27 @@ jjy_receive_tristate_jjy01 ( struct recv
 	if ( write ( pp->io.fd, pCmd, iCmdLen ) != iCmdLen ) {
 		refclock_report ( peer, CEVNT_FAULT ) ;
+	}
 	return 0 ;
+}
 /**************************************************************************************************/
 static int
 jjy_receive_cdex_jst2000 ( struct recvbuf *rbufp )
+{
-	static	char	*sFunctionName = "jjy_receive_cdex_jst2000" ;
+	static	const char	*sFunctionName = "jjy_receive_cdex_jst2000" ;
 	struct jjyunit      *up ;
 	struct refclockproc *pp ;
 	struct peer         *peer;
 	char	*pBuf ;
 	int 	iLen ;
 	int 	rc ;
 	/*
 	 * Initialize pointers and read the timecode and timestamp
 	 */
 	peer = (struct peer *) rbufp->recv_srcclock ;
 @@ -909,27 +909,27 @@ jjy_receive_cdex_jst2000 ( struct recvbu
 		break ;
+	}
 	return 1 ;
+}
 /**************************************************************************************************/
 static int
 jjy_receive_echokeisokuki_lt2000 ( struct recvbuf *rbufp )
+{
-	static	char	*sFunctionName = "jjy_receive_echokeisokuki_lt2000" ;
+	static	const char	*sFunctionName = "jjy_receive_echokeisokuki_lt2000" ;
 	struct jjyunit      *up ;
 	struct refclockproc *pp ;
 	struct peer	    *peer;
 	char	*pBuf ;
 	int 	iLen ;
 	int 	rc ;
 	int	i, ibcc, ibcc1, ibcc2 ;
 	/*
 	 * Initialize pointers and read the timecode and timestamp
 	 */
 @@ -1067,27 +1067,27 @@ jjy_receive_echokeisokuki_lt2000 ( struc
+	}
 	return 1 ;
+}
 /**************************************************************************************************/
 static int
 jjy_receive_citizentic_jjy200 ( struct recvbuf *rbufp )
+{
-	static char *sFunctionName = "jjy_receive_citizentic_jjy200" ;
+	static const char *sFunctionName = "jjy_receive_citizentic_jjy200" ;
 	struct jjyunit		*up ;
 	struct refclockproc	*pp ;
 	struct peer		*peer;
 	char	*pBuf ;
 	int	iLen ;
 	int	rc ;
 	char	cApostrophe, sStatus[3] ;
 	int	iWeekday ;
 	/*
 	* Initialize pointers and read the timecode and timestamp
 @@ -1219,32 +1219,32 @@ jjy_poll ( int unit, struct peer *peer )
 	default :
 		break ;
+	}
+}
 /**************************************************************************************************/
 static void
 jjy_poll_tristate_jjy01  ( int unit, struct peer *peer )
+{
-	static char *sFunctionName = "jjy_poll_tristate_jjy01" ;
+	static const char *sFunctionName = "jjy_poll_tristate_jjy01" ;
 	struct jjyunit	    *up;
 	struct refclockproc *pp;
-	char	*pCmd ;
+	const char *pCmd ;
 	int 	iCmdLen ;
 	pp = peer->procptr;
 	up = (struct jjyunit *) pp->unitptr ;
 	if ( ( pp->sloppyclockflag & CLK_FLAG1 ) == 0 ) {
 		up->linecount = 2 ;
+	}
 #ifdef DEBUG
 	if ( debug ) {
 		printf ( "%s (refclock_jjy.c) : flag1=%X CLK_FLAG1=%X up->linecount=%d\n",
 			sFunctionName, pp->sloppyclockflag, CLK_FLAG1,
 @@ -1340,41 +1340,41 @@ static void
 jjy_poll_citizentic_jjy200 ( int unit, struct peer *peer )
+{
 	/* Do nothing ( up->bPollFlag is set by the jjy_poll ) */
+}
 /**************************************************************************************************/
 static void
 printableString ( char *sOutput, int iOutputLen, char *sInput, int iInputLen )
+{
-	char	*printableControlChar[] = {
+	const char	*printableControlChar[] = {
 			"<NUL>", "<SOH>", "<STX>", "<ETX>",
 			"<EOT>", "<ENQ>", "<ACK>", "<BEL>",
 			"<BS>" , "<HT>" , "<LF>" , "<VT>" ,
 			"<FF>" , "<CR>" , "<SO>" , "<SI>" ,
 			"<DLE>", "<DC1>", "<DC2>", "<DC3>",
 			"<DC4>", "<NAK>", "<SYN>", "<ETB>",
 			"<CAN>", "<EM>" , "<SUB>", "<ESC>",
 			"<FS>" , "<GS>" , "<RS>" , "<US>" ,
 			" " } ;
 	int	i, j, n ;
 	for ( i = j = 0 ; i < iInputLen && j < iOutputLen ; i ++ ) {
-		if ( isprint( sInput[i] ) ) {
+		if ( isprint( (int)sInput[i] ) ) {
 			n = 1 ;
 			if ( j + 1 >= iOutputLen )
 				break ;
 			sOutput[j] = sInput[i] ;
 		} else if ( ( sInput[i] & 0xFF ) <
 			    COUNTOF(printableControlChar) ) {
 			n = strlen( printableControlChar[sInput[i] & 0xFF] ) ;
 			if ( j + n + 1 >= iOutputLen )
 				break ;
 			strncpy( sOutput + j,
 				 printableControlChar[sInput[i] & 0xFF],
 				 (size_t)iOutputLen - j ) ;
 		} else {

--- src/external/bsd/ntp/dist/ntpd/ntp_restrict.c 2012/01/31 21:26:46	1.1.1.2
+++ src/external/bsd/ntp/dist/ntpd/ntp_restrict.c 2012/02/01 20:48:01	1.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ntp_restrict.c,v 1.1.1.2 2012/01/31 21:26:46 kardel Exp $	*/
+/*	$NetBSD: ntp_restrict.c,v 1.2 2012/02/01 20:48:01 kardel Exp $	*/
 /*
  * ntp_restrict.c - determine host restrictions
  */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 #include <stdio.h>
 #include <sys/types.h>
 #include "ntpd.h"
 #include "ntp_if.h"
 @@ -38,27 +38,27 @@
  * your own interfaces. It was also thought it would sometimes be useful
  * to keep a misbehaving host or two from abusing your primary clock. It
  * has been expanded, however, to suit the needs of those with more
  * restrictive access policies.
  */
 /*
  * We will use two lists, one for IPv4 addresses and one for IPv6
  * addresses. This is not protocol-independant but for now I can't
  * find a way to respect this. We'll check this later... JFB 07/2001
  */
 #define MASK_IPV6_ADDR(dst, src, msk)					\
 	do {								\
 		int idx;						\
-		for (idx = 0; idx < COUNTOF((dst)->s6_addr); idx++) {	\
+		for (idx = 0; idx < (int)COUNTOF((dst)->s6_addr); idx++) { \
 			(dst)->s6_addr[idx] = (src)->s6_addr[idx]	\
 					      & (msk)->s6_addr[idx];	\
 		}							\
 	} while (0)
 /*
  * We allocate INC_RESLIST{4|6} entries to the free list whenever empty.
  * Auto-tune these to be just less than 1KB (leaving at least 16 bytes
  * for allocator overhead).
  */
 #define	INC_RESLIST4	((1024 - 16) / V4_SIZEOF_RESTRICT_U)
 #define	INC_RESLIST6	((1024 - 16) / V6_SIZEOF_RESTRICT_U)
 @@ -284,27 +284,27 @@ match_restrict6_addr(
 	u_short			port
+	)
+{
 	restrict_u *	res;
 	restrict_u *	next;
 	struct in6_addr	masked;
 	for (res = restrictlist6; res != NULL; res = next) {
 		next = res->link;
 		NTP_INSIST(next != res);
 		MASK_IPV6_ADDR(&masked, addr, &res->u.v6.mask);
 		if (ADDR6_EQ(&masked, &res->u.v6.addr)
 		    && (!(RESM_NTPONLY & res->mflags)
-			|| NTP_PORT == port))
+			|| NTP_PORT == (int)port))
 			break;
+	}
 	return res;
+}
 /*
  * match_restrict_entry - find an exact match on a restrict list.
+ *
  * Exact match is addr, mask, and mflags all equal.
  * In order to use more common code for IPv4 and IPv6, this routine
  * requires the caller to populate a restrict_u with mflags and either
  * the v4 or v6 address and mask as appropriate.  Other fields in the

--- src/external/bsd/ntp/dist/ntpq/ntpq.c 2012/02/01 07:46:23	1.4
+++ src/external/bsd/ntp/dist/ntpq/ntpq.c 2012/02/01 20:48:01	1.5

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ntpq.c,v 1.4 2012/02/01 07:46:23 kardel Exp $	*/
+/*	$NetBSD: ntpq.c,v 1.5 2012/02/01 20:48:01 kardel Exp $	*/
 /*
  * ntpq - query an NTP server using mode 6 commands
  */
 #include <stdio.h>
 #include <ctype.h>
 #include <signal.h>
 #include <setjmp.h>
 #include <sys/types.h>
 #include <sys/time.h>
 @@ -374,27 +374,27 @@ struct xcmd builtins[] = {
 #define	MAXVARLEN	256		/* maximum length of a variable name */
 #define	MAXVALLEN	400		/* maximum length of a variable value */
 #define	MAXOUTLINE	72		/* maximum length of an output line */
 #define SCREENWIDTH	76		/* nominal screen width in columns */
 /*
  * Some variables used and manipulated locally
  */
 struct sock_timeval tvout = { DEFTIMEOUT, 0 };	/* time out for reads */
 struct sock_timeval tvsout = { DEFSTIMEOUT, 0 };/* secondary time out */
 l_fp delay_time;				/* delay time */
 char currenthost[LENHOSTNAME];			/* current host name */
 int currenthostisnum;				/* is prior text from IP? */
-struct sockaddr_in hostaddr = { 0 };		/* host address */
+struct sockaddr_in hostaddr;			/* host address */
 int showhostnames = 1;				/* show host names by default */
 int ai_fam_templ;				/* address family */
 int ai_fam_default;				/* default address family */
 SOCKET sockfd;					/* fd socket is opened on */
 int havehost = 0;				/* set to 1 when host open */
 int s_port = 0;
 struct servent *server_entry = NULL;		/* server entry for ntp */
 /*
  * Sequence number used for requests.  It is incremented before
  * it is used.
 @@ -886,27 +886,27 @@ getresponse(
 						"%s: timed out, nothing received\n",
 						currenthost);
 				return ERR_TIMEOUT;
+			}
 			if (timeo)
 				fprintf(stderr,
 					"%s: timed out with incomplete data\n",
 					currenthost);
 			if (debug) {
 				fprintf(stderr,
 					"ERR_INCOMPLETE: Received fragments:\n");
 				for (f = 0; f < numfrags; f++)
 					fprintf(stderr,
-						"%2u: %5d %5d\t%3d octets\n",
+						"%2zu: %5d %5d\t%3d octets\n",
 						f, offsets[f],
 						offsets[f] +
 						counts[f],
 						counts[f]);
 				fprintf(stderr,
 					"last fragment %sreceived\n",
 					(seenlastfrag)
 					    ? ""
 					    : "not ");
+			}
 			return ERR_INCOMPLETE;
+		}
 @@ -925,27 +925,27 @@ getresponse(
 			while (len-- > 0) {
 				if (first-- == 0) {
 					printf("\n");
 					first = 7;
+				}
 				printf(" %02x", *data++ & 0xff);
+			}
 			printf("\n");
+		}
 		/*
 		 * Check for format errors.  Bug proofing.
 		 */
-		if (n < CTL_HEADER_LEN) {
+		if (n < (int)CTL_HEADER_LEN) {
 			if (debug)
 				printf("Short (%d byte) packet received\n", n);
 			continue;
+		}
 		if (PKT_VERSION(rpkt.li_vn_mode) > NTP_VERSION
 		    || PKT_VERSION(rpkt.li_vn_mode) < NTP_OLDVERSION) {
 			if (debug)
 				printf("Packet received with version %d\n",
 				       PKT_VERSION(rpkt.li_vn_mode));
 			continue;
+		}
 		if (PKT_MODE(rpkt.li_vn_mode) != MODE_CONTROL) {
 			if (debug)
 @@ -1021,27 +1021,27 @@ getresponse(
 		 * boundary and no smaller than claimed by rpkt.count
 		 */
 		if (n & 0x3) {
 			if (debug)
 				printf("Response packet not padded, "
 					"size = %d\n", n);
 			continue;
+		}
 		shouldbesize = (CTL_HEADER_LEN + count + 3) & ~3;
 		if (n < shouldbesize) {
 			printf("Response packet claims %u octets "
-				"payload, above %d received\n",
+				"payload, above %ld received\n",
 				count,
 				n - CTL_HEADER_LEN
 				);
 			return ERR_INCOMPLETE;
+		}
 		if (debug >= 3 && shouldbesize > n) {
 			u_int32 key;
 			u_int32 *lpkt;
 			int maclen;
 			/*
 			 * Usually we ignore authentication, but for debugging purposes
 @@ -1073,27 +1073,27 @@ getresponse(
 						printf("Auth okay!\n");
 					} else {
 						printf("Auth failed!\n");
+					}
+				}
+			}
+		}
 		if (debug >= 2)
 			printf("Got packet, size = %d\n", n);
 		if ((int)count > (n - CTL_HEADER_LEN)) {
 			if (debug)
 				printf("Received count of %d octets, "
-					"data in packet is %d\n",
+					"data in packet is %lu\n",
 					count, n-CTL_HEADER_LEN);
 			continue;
+		}
 		if (count == 0 && CTL_ISMORE(rpkt.r_m_e_op)) {
 			if (debug)
 				printf("Received count of 0 in non-final fragment\n");
 			continue;
+		}
 		if (offset + count > sizeof(pktdata)) {
 			if (debug)
 				printf("Offset %d, count %d, too big for buffer\n",
 				       offset, count);
 			return ERR_TOOMUCH;
 @@ -1177,27 +1177,27 @@ getresponse(
 		/*
 		 * If we've seen the last fragment, look for holes in the sequence.
 		 * If there aren't any, we're done.
 		 */
 		if (seenlastfrag && offsets[0] == 0) {
 			for (f = 1; f < numfrags; f++)
 				if (offsets[f-1] + counts[f-1] !=
 				    offsets[f])
 					break;
 			if (f == numfrags) {
 				*rsize = offsets[f-1] + counts[f-1];
 				if (debug)
 					fprintf(stderr,
-						"%u packets reassembled into response\n",
+						"%zu packets reassembled into response\n",
 						numfrags);
 				return 0;
+			}
+		}
 	}  /* giant for (;;) collecting response packets */
 }  /* getresponse() */
 /*
  * sendrequest - format and send a request packet
  */
 static int
 sendrequest(
 @@ -2220,27 +2220,27 @@ help(
 		col = 0;
 		for (word = 0; word < words; word++) {
 		 	length = strlen(list[word]);
 			col = max(col, length);
+		}
 		cols = SCREENWIDTH / ++col;
 		rows = (words + cols - 1) / cols;
 		fprintf(fp, "ntpq commands:\n");
 		for (row = 0; row < rows; row++) {
 			for (word = row; word < words; word += rows)
-				fprintf(fp, "%-*.*s", col,  col-1,
+				fprintf(fp, "%-*.*s", (int)col,  (int)col-1,
 					list[word]);
 			fprintf(fp, "\n");
+		}
 	} else {
 		cmd = pcmd->argval[0].string;
 		words = findcmd(cmd, builtins, opcmds, &xcp);
 		if (words == 0) {
 			fprintf(stderr,
 				"Command `%s' is unknown\n", cmd);
 			return;
 		} else if (words >= 2) {
 			fprintf(stderr,
 				"Command `%s' is ambiguous\n", cmd);
 @@ -3248,27 +3248,27 @@ tstflags(
 	snprintf(cp, cb, "%02lx", val);
 	cp += strlen(cp);
 	cb -= strlen(cp);
 	if (!val) {
 		strncat(cp, " ok", cb);
 		cp += strlen(cp);
 		cb -= strlen(cp);
 	} else {
 		if (cb) {
 			*cp++ = ' ';
 			cb--;
+		}
-		for (i = 0; i < COUNTOF(tstflagnames); i++) {
+		for (i = 0; i < (int)COUNTOF(tstflagnames); i++) {
 			if (val & 0x1) {
 				snprintf(cp, cb, "%s%s", sep,
 					 tstflagnames[i]);
 				sep = ", ";
 				cp += strlen(cp);
 				cb -= strlen(cp);
+			}
 			val >>= 1;
+		}
+	}
 	if (cb)
 		*cp = '\0';

--- src/external/bsd/ntp/dist/sntp/crypto.c 2012/02/01 07:46:23	1.3
+++ src/external/bsd/ntp/dist/sntp/crypto.c 2012/02/01 20:48:01	1.4

 @@ -1,14 +1,14 @@
-/*	$NetBSD: crypto.c,v 1.3 2012/02/01 07:46:23 kardel Exp $	*/
+/*	$NetBSD: crypto.c,v 1.4 2012/02/01 20:48:01 kardel Exp $	*/
 #include <config.h>
 #include "crypto.h"
 #include <ctype.h>
 struct key *key_ptr;
 size_t key_cnt = 0;
 int
 make_mac(
 	char *pkt_data,
 	int pkt_size,
 	int mac_size,
 @@ -43,27 +43,27 @@ make_mac(
  */
 int
 auth_md5(
 	char *pkt_data,
 	int pkt_size,
 	int mac_size,
 	struct key *cmp_key
+	)
+{
 	int  hash_len;
 	int  authentic;
 	char digest[20];
-	if (mac_size > sizeof(digest))
+	if (mac_size > (int)sizeof(digest))
 		return 0;
 	hash_len = make_mac(pkt_data, pkt_size, sizeof(digest), cmp_key,
 			    digest);
 	if (!hash_len)
 		authentic = FALSE;
 	else
 		authentic = !memcmp(digest, pkt_data + pkt_size + 4,
 				    hash_len);
 	return authentic;
+}
 static int
 hex_val(

--- src/external/bsd/ntp/dist/sntp/main.c 2012/02/01 07:46:23	1.3
+++ src/external/bsd/ntp/dist/sntp/main.c 2012/02/01 20:48:01	1.4

 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.3 2012/02/01 07:46:23 kardel Exp $	*/
+/*	$NetBSD: main.c,v 1.4 2012/02/01 20:48:01 kardel Exp $	*/
 #include <config.h>
 #include "main.h"
 #include "kod_management.h"
 #include "networking.h"
 #include "utilities.h"
 #include "log.h"
 int ai_fam_pref = AF_UNSPEC;
 struct key *keys = NULL;
 @@ -244,27 +244,27 @@ handle_pkt (
 		if (ENABLED_OPT(NORMALVERBOSE)) {
 			getnameinfo(host->ai_addr, host->ai_addrlen, addr_buf,
 				sizeof(addr_buf), NULL, 0, NI_NUMERICHOST);
 			printf("sntp handle_pkt: Received %i bytes from %s\n", rpktl, addr_buf);
+		}
 		GETTIMEOFDAY(&tv_dst, (struct timezone *)NULL);
 		p_SNTP_PRETEND_TIME = getenv("SNTP_PRETEND_TIME");
 		if (p_SNTP_PRETEND_TIME) {
 #if SIZEOF_TIME_T == 4
 			sscanf(p_SNTP_PRETEND_TIME, "%ld", &pretend_time);
 #elif SIZEOF_TIME_T == 8
-			sscanf(p_SNTP_PRETEND_TIME, "%lld", &pretend_time);
+			sscanf(p_SNTP_PRETEND_TIME, "%zd", &pretend_time);
 #else
 # include "GRONK: unexpected value for SIZEOF_TIME_T"
 #endif
 			tv_dst.tv_sec = pretend_time;
+		}
 		offset_calculation(rpkt, rpktl, &tv_dst, &offset,
 				   &precision, &root_dispersion);
 		for (digits = 0; (precision *= 10.) < 1.; ++digits)
 			/* empty */ ;
 		if (digits > 6)
 			digits = 6;

--- src/external/bsd/ntp/dist/sntp/networking.h 2012/02/01 07:46:23	1.3
+++ src/external/bsd/ntp/dist/sntp/networking.h 2012/02/01 20:48:01	1.4

 @@ -1,14 +1,14 @@
-/*	$NetBSD: networking.h,v 1.3 2012/02/01 07:46:23 kardel Exp $	*/
+/*	$NetBSD: networking.h,v 1.4 2012/02/01 20:48:01 kardel Exp $	*/
 #ifndef NETWORKING_H
 #define NETWORKING_H
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <strings.h>
 #include <errno.h>
 #include <config.h>
 #include <netdb.h>
 #include <unistd.h>
 #include <sys/types.h>
 @@ -50,27 +50,27 @@ int resolve_hosts (const char **hosts, i
 void create_socket (SOCKET *rsock, sockaddr_u *dest);
 void sendpkt (SOCKET rsock, sockaddr_u *dest, struct pkt *pkt, int len);
 int recvdata (SOCKET rsock, sockaddr_u *sender, char *rdata, int rdata_len);
 int recvpkt (SOCKET rsock, struct pkt *rpkt, unsigned int rsize, struct pkt *spkt);
 int recv_bcst_data (SOCKET rsock, char *rdata, int rdata_len, sockaddr_u *sas, sockaddr_u *ras);
 int recv_bcst_pkt (SOCKET rsock, struct pkt *rpkt, unsigned int rsize, sockaddr_u *sas);
-int process_pkt (struct pkt *rpkt, sockaddr_u *sas,	int pkt_len, int mode, struct pkt *spkt, char * func_name);
+int process_pkt (struct pkt *rpkt, sockaddr_u *sas,	int pkt_len, int mode, struct pkt *spkt, const char * func_name);
 /* Shortened peer structure. Not absolutely necessary yet */
 struct speer {
 	struct speer *next;
 	sockaddr_u srcadr;
 	u_char version;
 	u_char hmode;
 	u_char hpoll;
 	u_char minpoll;
 	u_char maxpoll;
 	u_int flags;
 	u_char num_events;
 	u_char ttl;

--- src/external/bsd/ntp/dist/sntp/log.c 2012/02/01 07:46:23	1.4
+++ src/external/bsd/ntp/dist/sntp/log.c 2012/02/01 20:48:01	1.5

 @@ -1,20 +1,20 @@
-/*	$NetBSD: log.c,v 1.4 2012/02/01 07:46:23 kardel Exp $	*/
+/*	$NetBSD: log.c,v 1.5 2012/02/01 20:48:01 kardel Exp $	*/
 #include <config.h>
 #include "log.h"
-char *progname = "sntp";	/* for msyslog use too */
+const char *progname = "sntp";	/* for msyslog use too */
 static void cleanup_log(void);
 void
 init_logging(void)
+{
 	openlog(progname, LOG_PID | LOG_CONS, OPENLOG_FAC);
 	msyslog_term = TRUE;
+}
 void
 open_logfile(
 	const char *logfile

--- src/external/bsd/ntp/dist/sntp/networking.c 2012/02/01 07:46:23	1.5
+++ src/external/bsd/ntp/dist/sntp/networking.c 2012/02/01 20:48:01	1.6

 @@ -1,36 +1,36 @@
-/*	$NetBSD: networking.c,v 1.5 2012/02/01 07:46:23 kardel Exp $	*/
+/*	$NetBSD: networking.c,v 1.6 2012/02/01 20:48:01 kardel Exp $	*/
 #include <config.h>
 #include "networking.h"
 char adr_buf[INET6_ADDRSTRLEN];
 /* resolve_hosts consumes an array of hostnames/addresses and its length, stores a pointer
  * to the array with the resolved hosts in res and returns the size of the array res.
  * pref_family enforces IPv4 or IPv6 depending on commandline options and system
  * capability. If pref_family is NULL or PF_UNSPEC any compatible family will be accepted.
  * Check here: Probably getaddrinfo() can do without ISC's IPv6 availability check?
  */
 int
 resolve_hosts (
 		const char **hosts,
 		int hostc,
 		struct addrinfo ***res,
 		int pref_family
+		)
+{
-	register unsigned int a;
+	register int a;
 	unsigned int resc;
 	struct addrinfo **tres;
 	if (hostc < 1 || NULL == res)
 		return 0;
 	tres = emalloc(sizeof(struct addrinfo *) * hostc);
 	for (a = 0, resc = 0; a < hostc; a++) {
 		struct addrinfo hints;
 		int error;
 		tres[resc] = NULL;
 #ifdef DEBUG
 @@ -187,27 +187,27 @@ recv_bcst_data (
 		if (bind(rsock, &sas->sa, SOCKLEN(sas)) < 0) {
 			if (ENABLED_OPT(NORMALVERBOSE))
 				printf("sntp recv_bcst_data: Couldn't bind() address %s:%d.\n",
 				       stoa(sas), SRCPORT(sas));
+		}
 #ifdef MCAST
 		if (setsockopt(rsock, IPPROTO_IP, IP_MULTICAST_LOOP, &mtrue, sizeof(mtrue)) < 0) {
 			/* some error message regarding setting up multicast loop */
 			return BROADCAST_FAILED;
+		}
 		mdevadr.imr_multiaddr.s_addr = NSRCADR(sas);
 		mdevadr.imr_interface.s_addr = htonl(INADDR_ANY);
-		if (mdevadr.imr_multiaddr.s_addr == -1) {
+		if (mdevadr.imr_multiaddr.s_addr == ~(unsigned)0) {
 			if (ENABLED_OPT(NORMALVERBOSE)) {
 				printf("sntp recv_bcst_data: %s:%d is not a broad-/multicast address, aborting...\n",
 				       stoa(sas), SRCPORT(sas));
+			}
 			return BROADCAST_FAILED;
+		}
 		if (setsockopt(rsock, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mdevadr, sizeof(mdevadr)) < 0) {
 			if (ENABLED_OPT(NORMALVERBOSE)) {
 				buf = ss_to_str(sas);
 				printf("sntp recv_bcst_data: Couldn't add IP membership for %s\n", buf);
 				free(buf);
+			}
+		}
 @@ -283,47 +283,47 @@ recv_bcst_data (
 	if (IS_IPV6(sas))
 		setsockopt(rsock, IPPROTO_IPV6, IPV6_LEAVE_GROUP, &btrue, sizeof(btrue));
 #endif
 	return recv_bytes;
+}
 int
 process_pkt (
 	struct pkt *rpkt,
 	sockaddr_u *sas,
 	int pkt_len,
 	int mode,
 	struct pkt *spkt,
-	char * func_name
+	const char * func_name
+	)
+{
 	unsigned int key_id = 0;
 	struct key *pkt_key = NULL;
 	int is_authentic = 0;
 	unsigned int exten_words, exten_words_used = 0;
 	int mac_size;
 	/*
 	 * Parse the extension field if present. We figure out whether
 	 * an extension field is present by measuring the MAC size. If
 	 * the number of words following the packet header is 0, no MAC
 	 * is present and the packet is not authenticated. If 1, the
 	 * packet is a crypto-NAK; if 3, the packet is authenticated
 	 * with DES; if 5, the packet is authenticated with MD5; if 6,
 	 * the packet is authenticated with SHA. If 2 or 4, the packet
 	 * is a runt and discarded forthwith. If greater than 6, an
 	 * extension field is present, so we subtract the length of the
 	 * field and go around again.
 	 */
-	if (pkt_len < LEN_PKT_NOMAC || (pkt_len & 3) != 0) {
+	if (pkt_len < (int)LEN_PKT_NOMAC || (pkt_len & 3) != 0) {
 unusable:
 		if (ENABLED_OPT(NORMALVERBOSE))
 			printf("sntp %s: Funny packet length: %i. Discarding package.\n", func_name, pkt_len);
 		return PACKET_UNUSEABLE;
+	}
 	/* skip past the extensions, if any */
 	exten_words = ((unsigned)pkt_len - LEN_PKT_NOMAC) >> 2;
 	while (exten_words > 6) {
 		unsigned int exten_len;
 		exten_len = ntohl(rpkt->exten[exten_words_used]) & 0xffff;
 		exten_len = (exten_len + 7) >> 2; /* convert to words, add 1 */
 		if (exten_len > exten_words || exten_len < 5)
 			goto unusable;

--- src/external/bsd/ntp/dist/sntp/libopts/numeric.c 2012/01/31 21:27:49	1.1.1.2
+++ src/external/bsd/ntp/dist/sntp/libopts/numeric.c 2012/02/01 20:48:01	1.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: numeric.c,v 1.1.1.2 2012/01/31 21:27:49 kardel Exp $	*/
+/*	$NetBSD: numeric.c,v 1.2 2012/02/01 20:48:01 kardel Exp $	*/
 /**
  * \file numeric.c
+ *
  *  Time-stamp:      "2011-03-25 16:26:10 bkorb"
+ *
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
  *  AutoOpts is Copyright (c) 1992-2011 by Bruce Korb - all rights reserved
+ *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
 @@ -30,27 +30,27 @@
 /*=export_func  optionShowRange
  * private:
+ *
  * what:
  * arg:   + tOptions* + pOpts     + program options descriptor  +
  * arg:   + tOptDesc* + pOptDesc  + the descriptor for this arg +
  * arg:   + void *    + rng_table + the value range tables      +
  * arg:   + int       + rng_count + the number of entries       +
+ *
  * doc:
  *   Show information about a numeric option with range constraints.
 =*/
 void
-optionShowRange(tOptions* pOpts, tOptDesc* pOD, void * rng_table, int rng_ct)
+optionShowRange(tOptions* pOpts, tOptDesc* pOD, const void * rng_table, int rng_ct)
+{
     static char const bullet[] = "\t\t\t\t- ";
     static char const deepin[] = "\t\t\t\t  ";
     static char const onetab[] = "\t";
     const struct {long const rmin, rmax;} * rng = rng_table;
     char const * pz_indent    = bullet;
     /*
      * The range is shown only for full usage requests and an error
      * in this particular option.
      */

--- src/external/bsd/ntp/dist/sntp/libopts/autoopts/options.h 2012/02/01 07:46:30	1.3
+++ src/external/bsd/ntp/dist/sntp/libopts/autoopts/options.h 2012/02/01 20:48:01	1.4

 @@ -1,14 +1,14 @@
-/*	$NetBSD: options.h,v 1.3 2012/02/01 07:46:30 kardel Exp $	*/
+/*	$NetBSD: options.h,v 1.4 2012/02/01 20:48:01 kardel Exp $	*/
 /*   -*- buffer-read-only: t -*- vi: set ro:
+ *
  *  DO NOT EDIT THIS FILE   (options.h)
+ *
  *  It has been AutoGen-ed  April 29, 2011 at 03:44:02 PM by AutoGen 5.11.9
  *  From the definitions    funcs.def
  *  and the template file   options_h
+ *
  *  This file defines all the global structures and special values
  *  used in the automated option processing library.
+ *
  *  Automated Options Copyright (C) 1992-2011 by Bruce Korb
 @@ -1030,27 +1030,27 @@ extern void optionNumericVal(tOptions*,
 extern void optionPagedUsage(tOptions*, tOptDesc*);
 extern void optionParseShell(tOptions*);
 extern void optionPrintVersion(tOptions*, tOptDesc*);
 extern void optionPutShell(tOptions*);
 extern void optionResetOpt(tOptions*, tOptDesc*);
 extern void optionSetMembers(tOptions*, tOptDesc*, char const * const *, unsigned int);
-extern void optionShowRange(tOptions*, tOptDesc*, void *, int);
+extern void optionShowRange(tOptions*, tOptDesc*, const void *, int);
 extern void optionStackArg(tOptions*, tOptDesc*);
 extern void optionTimeDate(tOptions*, tOptDesc*);
 extern void optionTimeVal(tOptions*, tOptDesc*);
 extern void optionUnstackArg(tOptions*, tOptDesc*);
 extern void optionUsage(tOptions*, int);
 extern void optionVersionStderr(tOptions*, tOptDesc*);

--- src/external/bsd/ntp/dist/util/ntp-keygen-opts.c 2012/02/01 07:46:30	1.3
+++ src/external/bsd/ntp/dist/util/ntp-keygen-opts.c 2012/02/01 20:48:02	1.4

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ntp-keygen-opts.c,v 1.3 2012/02/01 07:46:30 kardel Exp $	*/
+/*	$NetBSD: ntp-keygen-opts.c,v 1.4 2012/02/01 20:48:02 kardel Exp $	*/
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.c)
+ *
  *  It has been AutoGen-ed  December 24, 2011 at 06:34:40 PM by AutoGen 5.12
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
+ *
  * Generated from AutoOpts 35:0:10 templates.
+ *
  *  AutoOpts is a copyrighted work.  This source file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
  *  by the ntp-keygen author or copyright holder.  AutoOpts is
 @@ -848,27 +848,27 @@ doOptModulus(tOptions* pOptions, tOptDes
             continue;  /* ranges need not be ordered. */
         if (pOptDesc->optArg.argInt == rng[ix].rmin)
             return;
         if (rng[ix].rmax == LONG_MIN)
             continue;
         if (pOptDesc->optArg.argInt <= rng[ix].rmax)
             return;
+    }
     option_usage_fp = stderr;
 emit_ranges:
-    optionShowRange(pOptions, pOptDesc, (void *)rng, 1);
+    optionShowRange(pOptions, pOptDesc, (const void *)rng, 1);
+}
 #endif /* defined OPENSSL */
 /* extracted from optmain.tlib near line 128 */
 #if defined(TEST_NTP_KEYGEN_OPTS) /* TEST MAIN PROCEDURE: */
 extern void optionPutShell(tOptions*);
 int
 main(int argc, char ** argv)
+{
     int res = NTP_KEYGEN_EXIT_SUCCESS;
     (void)optionProcess(&ntp_keygenOptions, argc, argv);