cleanup

bk: 5541a94fUbNoKqIbEI1s2M3v1_m6LA

diff --git a/ChangeLog b/ChangeLog
index 2df18f35662d05a9060ebe1db97eb3721e3cdf4d..676a90e004f0617232f9f510ca46146a28fca825 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,11 @@
 ---
 
-* [Bug 2745] ntpd -x steps clock on leap second 
-   Do leap second stepping only of the step adjustment is beyond the
-   proper jump distance limit and step correction is allowed at all. 
 * CID 1269537: Clean up a line of dead code in getShmTime().
 * [Bug 2612] restrict: Warn when 'monitor' can't be disabled because
   of 'limited'.
+* [Bug 2745] ntpd -x steps clock on leap second 
+   Do leap second stepping only of the step adjustment is beyond the
+   proper jump distance limit and step correction is allowed at all. 
 * [Bug 2794] Clean up kernel clock status reports.
 * [Bug 2800] refclock_true.c true_debug() can't open debug log because
   of incompatible open/fdopen parameters.

diff --git a/ntpd/ntp_timer.c b/ntpd/ntp_timer.c
index 83df025a0e3fdf6b54756b7e3e3e9df3357ddb3b..e7e949e149f5fe4eab2aa54468ad0a11c2303f59 100644 (file)
--- a/ntpd/ntp_timer.c
+++ b/ntpd/ntp_timer.c
@@ -472,7 +472,7 @@ alarming(
 # endif
 # ifdef DEBUG
        if (debug >= 4)
-               (void)(0 != write(1, msg, strlen(msg)));
+               (void)(-1 == write(1, msg, strlen(msg)));
 # endif
 }
 #endif /* SYS_WINNT */

diff --git a/ntpd/refclock_shm.c b/ntpd/refclock_shm.c
index c8cf729a372a1444c6709aa91628743bac81c4e1..eb0ee52c3367d0ec6b31885f56e22db79d2adfe9 100644 (file)
--- a/ntpd/refclock_shm.c
+++ b/ntpd/refclock_shm.c
@@ -118,6 +118,7 @@ struct shmunit {
        time_t max_delay;       /* age/stale limit */
 };
 
+
 static struct shmTime*
 getShmTime(
        int unit,
@@ -145,8 +146,8 @@ getShmTime(
                msyslog(LOG_ERR, "SHM shmat (unit %d): %m", unit);
                return NULL;
        }
-       return p;
 
+       return p;
 #else
 
        static const char * nspref[2] = { "Local", "Global" };
@@ -202,6 +203,8 @@ getShmTime(
        /* NOTREACHED */
        ENSURE(!"getShmTime(): Not reached.");
 }
+
+
 /*
  * shm_start - attach to shared memory
  */