From: Dave Hart <hart@ntp.org>
Date: Wed, 15 Feb 2012 02:48:49 +0000 (+0000)
Subject: Restore accidentally-removed "parsetime" local variable declaration
X-Git-Tag: NTP_4_2_7P257~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=176bb3605c9e8c1648664c802b18b68fdf58ae32;p=thirdparty%2Fntp.git

Restore accidentally-removed "parsetime" local variable declaration
  in refclock_parse.c stream_receive().
Remove Windows-specific code from indicate_refclock_packet() as it is
  now used only on non-Windows systems.
process_refclock_packet() is used only on Windows, #ifdef away elsewhere.

bk: 4f3b1d11p196CYgoFFpCmi_HqmNKqQ
---

diff --git a/ntpd/ntp_refclock.c b/ntpd/ntp_refclock.c
index 43b736aac..22ca7ff04 100644
--- a/ntpd/ntp_refclock.c
+++ b/ntpd/ntp_refclock.c
@@ -681,9 +681,7 @@ indicate_refclock_packet(
 		return TRUE;
 	}
 	add_full_recv_buffer(rb);
-#ifdef HAVE_IO_COMPLETION_PORT
-	SetEvent(WaitableIoEventHandle);
-#endif
+
 	return FALSE;
 }
 
@@ -695,6 +693,7 @@ indicate_refclock_packet(
  * is used (notably Windows). This is acting as a trampoline to make the
  * real calls to the refclock functions.
  */
+#ifdef HAVE_IO_COMPLETION_PORT
 void
 process_refclock_packet(
 	struct recvbuf * rb
@@ -716,6 +715,7 @@ process_refclock_packet(
 		(*rio->clock_recv)(rb);
 	}
 }
+#endif	/* HAVE_IO_COMPLETION_PORT */
 
 
 /*
diff --git a/ntpd/refclock_parse.c b/ntpd/refclock_parse.c
index 157753e38..42eddfc20 100644
--- a/ntpd/refclock_parse.c
+++ b/ntpd/refclock_parse.c
@@ -1968,6 +1968,7 @@ stream_receive(
 	)
 {
 	struct parseunit * parse;
+	parsetime_t parsetime;
 
 	parse = (struct parseunit *)rbufp->recv_peer->procptr->unitptr;
 	if (!parse->peer)