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

bk: 553caf33QIGcvAWk4SrrI0zU_SLkWw

diff --git a/ChangeLog b/ChangeLog
index da9a0870e2b547ac857b73a0ed3845095d718082..044477d4a8266ba475e6936dbcb806720447a08c 100644 (file)
--- 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 7174abdbf4cf3a4765a9b108732dd476ef7a2dd5..c8cf729a372a1444c6709aa91628743bac81c4e1 100644 (file)
--- 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