From: Martin Burnicki Date: Wed, 28 Jan 2015 16:04:07 +0000 (+0100) Subject: [Bug 2740] Removed some obsolete code from the parse driver. X-Git-Tag: NTP_4_2_8P1_RC2~2^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=826164152149f1d1b25a6919ca0a28c416b9965f;p=thirdparty%2Fntp.git [Bug 2740] Removed some obsolete code from the parse driver. bk: 54c90877V_flqqCkIIEUecPf0CR33g --- diff --git a/ChangeLog b/ChangeLog index 55c2fcbe0..a9b2e92bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +* [Bug 2740] Removed some obsolete code from the parse driver. --- (4.2.8p1-RC1) 2015/01/24 Released by Harlan Stenn diff --git a/ntpd/refclock_parse.c b/ntpd/refclock_parse.c index f76c05ff1..9a5b4f526 100644 --- a/ntpd/refclock_parse.c +++ b/ntpd/refclock_parse.c @@ -4177,20 +4177,7 @@ parse_process( */ if (PARSE_PPS(parsetime->parse_state) && CLK_PPS(parse->peer)) { - /* refclock_pps includes fudgetime1 - we keep the RS232 offset in there :-( */ - double savedtime1 = parse->generic->fudgetime1; - - parse->generic->fudgetime1 = fudge; - - if (refclock_pps(parse->peer, &parse->atom, - parse->flags & (CLK_FLAG1|CLK_FLAG2|CLK_FLAG3|CLK_FLAG4))) { - parse->peer->flags |= FLAG_PPS; - } else { - parse->peer->flags &= ~FLAG_PPS; - } - - parse->generic->fudgetime1 = savedtime1; - + parse->peer->flags |= FLAG_PPS; parse_hardpps(parse, PARSE_HARDPPS_ENABLE); } #endif