From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 30 Apr 2015 05:01:21 +0000 (+0000)
Subject: cleanup
X-Git-Tag: NTP_4_3_25~6^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9687b69d573d2c59b74113e75a9495243e217ff;p=thirdparty%2Fntp.git

cleanup

bk: 5541b721xoHtRNR0fACLHeguOteBbQ
---

diff --git a/ChangeLog b/ChangeLog
index 1c1dd1484..fa1602ca4 100644
--- 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 19de755f6..eb0ee52c3 100644
--- 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
  */