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 43b736aacf16fb19181256a3e8a4372e8c4d79a2..22ca7ff043fde8857dcc5c93c95dff424b7e9fe1 100644 (file)
--- 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 157753e38b264de738829b1a06c76fc2122b4bc6..42eddfc202a8726561756839009c495d07c1c22b 100644 (file)
--- 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)