Revert "Another step in prying ntplib loose. Partly decouple ppsthread.c fom sessions."

Previous approch was a bit too frontal.

1 files changed, 3 insertions, 15 deletions

diff --git a/gpsmon.c b/gpsmon.c
index e951b6b4..04739324 100644
--- a/gpsmon.c
+++ b/gpsmon.c
@@ -249,19 +249,7 @@ void pps_update(WINDOW *win, int y, int x)
     /*@-type -noeffect@*/ /* splint is confused about struct timespec */
     struct timedelta_t ppstimes;
 
-    int status = pps_thread_lastpps(&session.pps_state, &ppstimes);
-
-    if (status == PPS_LOCK_ERR) {
-	char errbuf[BUFSIZ] = "unknown error";
-	(void)strerror_r(errno, errbuf,(int) sizeof(errbuf));
-	gpsd_report(&session.context->errout, LOG_ERROR,
-		"PPS: pthread_mutex_unlock() : %s\n", errbuf);
-    } else if (status == PPS_LOCK_ERR) {
-	char errbuf[BUFSIZ] = "unknown error";
-	(void)strerror_r(errno, errbuf,(int) sizeof(errbuf));
-	gpsd_report(&session.context->errout, LOG_ERROR,
-		"PPS: pthread_mutex_lock() : %s\n", errbuf);
-    } else {
+    if (pps_thread_lastpps(&session, &ppstimes) > 0) {
 	/* NOTE: can not use double here due to precision requirements */
 	struct timespec timedelta;
 	(void)wmove(win, y, x);
@@ -802,9 +790,9 @@ static void gpsmon_hook(struct gps_device_t *device, gps_mask_t changed UNUSED)
 			"------------------- PPS offset: %.20s ------\n ",
 			timedelta_str);
 	    /* coverity[missing_lock] */
-	    session.pps_state.ppslast = noclobber.pps;
+	    session.ppslast = noclobber.pps;
 	    /* coverity[missing_lock] */
-	    session.pps_state.ppscount++;
+	    session.ppscount++;
 	}
     }
     else