cleanup

bk: 5541b721xoHtRNR0fACLHeguOteBbQ

diff --git a/ChangeLog b/ChangeLog
index 1c1dd1484cb745afca8ce059cfcd312f72dfd839..fa1602ca4d242f674e5a9d367c630efb1552af43 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,5 @@
 ---
 
-* [Bug 2808] GPSD_JSON driver enhancements, step 1
-  fix coverity issues with refclock_gpsdjson and refclock_shm
-  Add a few more tallies as per Hal Murray's suggestions
 * CID 1269537: Clean up a line of dead code in getShmTime().
 * [Bug 2612] restrict: Warn when 'monitor' can't be disabled because
   of 'limited'.

diff --git a/ntpd/refclock_shm.c b/ntpd/refclock_shm.c
index 19de755f6f61b08b98968014b7d7516c0f11afe7..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,
@@ -146,6 +147,7 @@ getShmTime(
                return NULL;
        }
 
+       return p;
 #else
 
        static const char * nspref[2] = { "Local", "Global" };
@@ -201,6 +203,8 @@ getShmTime(
        /* NOTREACHED */
        ENSURE(!"getShmTime(): Not reached.");
 }
+
+
 /*
  * shm_start - attach to shared memory
  */