Use recv_buffer instead of the longer recv_space.X_recv_buffer

bk: 643ba40aTbQ3V64X20Ran-gmQ0gmGw

diff --git a/ChangeLog b/ChangeLog
index 5cea38e5df2e69f2bd1712fd1a2b848bdfb87eb0..16f264ade8a79e324d51f1c9b6484eef8c1e7fec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -77,7 +77,8 @@
              Integrated patch from Brian Utterback. <hart@ntp.org>
 * [Bug 2525] Turn on automake subdir-objects across the project. <hart@ntp.org>
 * [Bug 2410] syslog an error message on panic exceeded. <brian.utterback@oracle.com>
-* Disable "embedded NUL in string" messages in libopts, when we can. <stenn@>
+* Use recv_buffer instead of the longer recv_space.X_recv_buffer.
+* Disable "embedded NUL in string" warnings in libopts, when we can. <stenn@>
 * Use https in the AC_INIT URLs in configure.ac.  <stenn@ntp.org>
 * Implement NTP_FUNC_REALPATH.  <stenn@ntp.org>
 * Lose a gmake construct in ntpd/Makefile.am.  <stenn@ntp.org>

diff --git a/ntpd/refclock_fg.c b/ntpd/refclock_fg.c
index 602cff8b37daf000ce74aaa969a5003d9594462f..abcf43f9cb9e507db95885140113f6a8da32a0f5 100644 (file)
--- a/ntpd/refclock_fg.c
+++ b/ntpd/refclock_fg.c
@@ -244,11 +244,11 @@ fg_receive(
        }
 
        /* Below I trying to find a correct reply in buffer.
-        * Sometime GPS reply located in the beginnig of buffer,
+        * Sometime GPS reply located in the beginning of buffer,
         * sometime you can find it with some offset.
         */
 
-       bpt = (char *)rbufp->recv_space.X_recv_buffer;
+       bpt = (char *)rbufp->recv_buffer;
        while (*bpt != '\x10')
                bpt++;
 

diff --git a/ntpd/refclock_palisade.c b/ntpd/refclock_palisade.c
index bfe11e2aac76c6b1653ab19d6621dc6fae6cb589..a9fe2689575bb87b2d27b9c6857baef6133b664f 100644 (file)
--- a/ntpd/refclock_palisade.c
+++ b/ntpd/refclock_palisade.c
@@ -1279,7 +1279,7 @@ praecis_parse (
                return;
        }
 
-       memcpy(buf+p, rbufp->recv_space.X_recv_buffer, rbufp->recv_length);
+       memcpy(buf+p, rbufp->recv_buffer, rbufp->recv_length);
        p += rbufp->recv_length;
 
        if (   p >= 2