From: Harlan Stenn Date: Mon, 3 Jan 2000 20:51:02 +0000 (-0000) Subject: ChangeLog, refclock_fg.c: X-Git-Tag: NTP_4_0_98_J~12 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=117a4ea64dd5fdfe1cf106b20296c5da082c9eaf;p=thirdparty%2Fntp.git ChangeLog, refclock_fg.c: * ntpd/refclock_fg.c (fg_receive): Cast. From: Tom Smith bk: 38710bb6bei5lBsYNxDz-KKgglEs8g --- diff --git a/ChangeLog b/ChangeLog index 75f6a65e92..fae937d67b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2000-01-03 Harlan Stenn + * ntpd/refclock_fg.c (fg_receive): Cast. + From: Tom Smith + * ntpd/map_vme.c (map_vme): tx.access_result indicates failure on < 0, not <= 0. A fix that apparently did not get brought over from the ntp3 base. diff --git a/ntpd/refclock_fg.c b/ntpd/refclock_fg.c index c0f58da209..ce726a36e0 100644 --- a/ntpd/refclock_fg.c +++ b/ntpd/refclock_fg.c @@ -211,13 +211,12 @@ fg_receive( * sometime you can find it with some offset. */ - bpt=rbufp->recv_space.X_recv_buffer; + bpt = (char *)rbufp->recv_space.X_recv_buffer; while(*bpt != '') bpt++; memcpy(buf, bpt, LENFG); - #define BP2(x) ( buf[x] & 15 ) #define BP1(x) (( buf[x] & 240 ) >> 4) @@ -251,7 +250,6 @@ fg_receive( pp->year, pp->day, pp->hour, pp->minute, pp->second); #endif - if (peer->stratum <= 1) peer->refid = pp->refid; pp->disp = (10e-6); @@ -264,6 +262,7 @@ fg_receive( if (!refclock_process(pp)) refclock_report(peer, CEVNT_BADTIME); + return; }