Fix typos in the [Bug 963] patch

bk: 47463b5afUoNw0p7ob1Gz4kaviG55w

diff --git a/ChangeLog b/ChangeLog
index e021caf70ac8faf8bb9b0ae61408520583b92ce7..251101d8f62e64f7a246b4ccbc75f343c2ff9cb6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Fix typos in the [Bug 963] patch.
 * bootstrap: squawk if genver fails.  Use -f with cp in case Dave does a chown.
 * Remove obsolete simulator command-line options.
 * ntp_request.c: [CID 36] zero sin_zero.

diff --git a/libntp/systime.c b/libntp/systime.c
index 95acf50051a340cefd42b4ebd7295864b33ac02b..c1ddd3d8ce52b7e83553b29b979ed0f04e5bd730 100644 (file)
--- a/libntp/systime.c
+++ b/libntp/systime.c
@@ -98,7 +98,7 @@ get_systime(
         */
        GETTIMEOFDAY(&tv, NULL);
        now->l_i = tv.tv_sec + JAN_1970;
-       dtemp = ts.tv_usec + (ntp_random() * 2. / FRAC) * sys_tick *
+       dtemp = tv.tv_usec + (ntp_random() * 2. / FRAC) * sys_tick *
            1e6;
        dtemp = dtemp / 1e6 + sys_residual;
        if (dtemp >= 1.) {

diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index 02d53a7f2b913ea76c55ad25826dbd726dcc1c04..3f83652a34faa30ad80b06c5fd2ebdef3b44da7b 100644 (file)
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -3005,7 +3005,7 @@ static l_fp
                        l_fp nts;
                        DPRINTF(4, ("fetch_timestamp: system network time stamp: %ld.%06ld\n", tvp->tv_sec, tvp->tv_usec));
                        nts.l_i = tvp->tv_sec + JAN_1970;
-                       dtemp = (tvp->tv_usec + (ntp_random() * 2. / FRAC) /
+                       dtemp = (tvp->tv_usec + (ntp_random() * 2. / FRAC)) /
                            1e6;
                        nts.l_uf = (u_int32)(dtemp * FRAC);
 #ifdef DEBUG_TIMING