From: Harlan Stenn Date: Sun, 16 Apr 2023 07:30:18 +0000 (-0500) Subject: Use recv_buffer instead of the longer recv_space.X_recv_buffer X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b222feb500b80d92fd4e37265ab5114f26566dd;p=thirdparty%2Fntp.git Use recv_buffer instead of the longer recv_space.X_recv_buffer bk: 643ba40aTbQ3V64X20Ran-gmQ0gmGw --- diff --git a/ChangeLog b/ChangeLog index 5cea38e5d..16f264ade 100644 --- a/ChangeLog +++ b/ChangeLog @@ -77,7 +77,8 @@ Integrated patch from Brian Utterback. * [Bug 2525] Turn on automake subdir-objects across the project. * [Bug 2410] syslog an error message on panic exceeded. -* Disable "embedded NUL in string" messages in libopts, when we can. +* Use recv_buffer instead of the longer recv_space.X_recv_buffer. +* Disable "embedded NUL in string" warnings in libopts, when we can. * Use https in the AC_INIT URLs in configure.ac. * Implement NTP_FUNC_REALPATH. * Lose a gmake construct in ntpd/Makefile.am. diff --git a/ntpd/refclock_fg.c b/ntpd/refclock_fg.c index 602cff8b3..abcf43f9c 100644 --- 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 bfe11e2aa..a9fe26895 100644 --- 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