From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 26 Apr 2015 09:26:11 +0000 (-0400)
Subject: CID 1269537: Clean up a line of dead code in getShmTime().
X-Git-Tag: NTP_4_3_20~3^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7295b9402f4226989223d59eb30606ea5af2dcbb;p=thirdparty%2Fntp.git

CID 1269537: Clean up a line of dead code in getShmTime().

bk: 553caf33QIGcvAWk4SrrI0zU_SLkWw
---

diff --git a/ChangeLog b/ChangeLog
index da9a0870e..044477d4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 ---
 
+* CID 1269537: Clean up a line of dead code in getShmTime().
 * [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/refclock_shm.c b/ntpd/refclock_shm.c
index 7174abdbf..c8cf729a3 100644
--- a/ntpd/refclock_shm.c
+++ b/ntpd/refclock_shm.c
@@ -24,6 +24,7 @@
 #include "timespecops.h"
 #undef fileno
 #include "ntp_stdlib.h"
+#include "ntp_assert.h"
 
 #undef fileno
 #include <ctype.h>
@@ -195,9 +196,11 @@ getShmTime(
 		return NULL;
 	}
 
+	return p;
 #endif
 
-	return p;
+	/* NOTREACHED */
+	ENSURE(!"getShmTime(): Not reached.");
 }
 /*
  * shm_start - attach to shared memory