Merge ntpd & friends 4.2.4p5 from vendor/ntp/dist into head. Next commit

will update usr.sbin/ntp to match this.

MFC after:	2 weeks

1 files changed, 0 insertions, 8 deletions

diff --git a/contrib/ntp/ntpd/refclock_hopfpci.c b/contrib/ntp/ntpd/refclock_hopfpci.c
index 1b023198d8db..81c186d168bd 100644
--- a/contrib/ntp/ntpd/refclock_hopfpci.c
+++ b/contrib/ntp/ntpd/refclock_hopfpci.c
@@ -181,17 +181,11 @@ hopfpci_shutdown(
 	struct peer *peer
 	)
 {
-	struct refclockproc *pp;
-	register struct hopfpciTime *up;
-
-	pp = peer->procptr;
-	up = (struct hopfpciTime *)pp->unitptr;
 
 #ifndef SYS_WINNT
 	close(fd);
 #else
 	CloseHopfDevice();
-/*	UnmapViewOfFile (up); */
 #endif
 }
 
@@ -206,11 +200,9 @@ hopfpci_poll(
 	)
 {
 	struct refclockproc *pp;
-	register struct hopfpciTime *up;
 	HOPFTIME m_time;
 
 	pp = peer->procptr;
-	up = (struct hopfpciTime *)pp->unitptr;
 
 #ifndef SYS_WINNT
 	ioctl(fd,HOPF_CLOCK_GET_UTC,&m_time);