Now that the transition is done we can restore the gpsd_report name.

All regression tests pass.

1 files changed, 12 insertions, 12 deletions

diff --git a/isgps.c b/isgps.c
index 896a7f64..dcec5d0c 100644
--- a/isgps.c
+++ b/isgps.c
@@ -141,7 +141,7 @@ unsigned int isgps_parity(isgps30bits_t th)
     /*@ -charint @*/
 
 #ifdef __UNUSED__
-    gpsd_notify(errout, ISGPS_ERRLEVEL_BASE + 2, "ISGPS parity %u\n", p);
+    gpsd_report(errout, ISGPS_ERRLEVEL_BASE + 2, "ISGPS parity %u\n", p);
 #endif /* __UNUSED__ */
     return (p);
 }
@@ -186,7 +186,7 @@ enum isgpsstat_t isgps_decode(struct gps_lexer_t *lexer,
 {
     /* ASCII characters 64-127, @ through DEL */
     if ((c & MAG_TAG_MASK) != MAG_TAG_DATA) {
-	gpsd_notify(&lexer->errout, ISGPS_ERRLEVEL_BASE + 1,
+	gpsd_report(&lexer->errout, ISGPS_ERRLEVEL_BASE + 1,
 		    "ISGPS word tag not correct, skipping byte\n");
 	return ISGPS_SKIP;
     }
@@ -206,18 +206,18 @@ enum isgpsstat_t isgps_decode(struct gps_lexer_t *lexer,
 		lexer->isgps.curr_word |=
 		    c >> -(lexer->isgps.curr_offset);
 	    }
-	    gpsd_notify(&lexer->errout, ISGPS_ERRLEVEL_BASE + 2,
+	    gpsd_report(&lexer->errout, ISGPS_ERRLEVEL_BASE + 2,
 			"ISGPS syncing at byte %lu: 0x%08x\n",
 			lexer->char_counter, lexer->isgps.curr_word);
 
 	    if (preamble_match(&lexer->isgps.curr_word)) {
 		if (isgps_parityok(lexer->isgps.curr_word)) {
-		    gpsd_notify(&lexer->errout, ISGPS_ERRLEVEL_BASE + 1,
+		    gpsd_report(&lexer->errout, ISGPS_ERRLEVEL_BASE + 1,
 				"ISGPS preamble ok, parity ok -- locked\n");
 		    lexer->isgps.locked = true;
 		    break;
 		}
-		gpsd_notify(&lexer->errout, ISGPS_ERRLEVEL_BASE + 1,
+		gpsd_report(&lexer->errout, ISGPS_ERRLEVEL_BASE + 1,
 			    "ISGPS preamble ok, parity fail\n");
 	    }
 	    lexer->isgps.curr_offset++;
@@ -246,13 +246,13 @@ enum isgpsstat_t isgps_decode(struct gps_lexer_t *lexer,
 		 * another preamble pattern in the data stream. -wsr
 		 */
 		if (preamble_match(&lexer->isgps.curr_word)) {
-		    gpsd_notify(&lexer->errout, ISGPS_ERRLEVEL_BASE + 2,
+		    gpsd_report(&lexer->errout, ISGPS_ERRLEVEL_BASE + 2,
 				"ISGPS preamble spotted (index: %u)\n",
 				lexer->isgps.bufindex);
 		    lexer->isgps.bufindex = 0;
 		}
 #endif
-		gpsd_notify(&lexer->errout, ISGPS_ERRLEVEL_BASE + 2,
+		gpsd_report(&lexer->errout, ISGPS_ERRLEVEL_BASE + 2,
 			    "ISGPS processing word %u (offset %d)\n",
 			    lexer->isgps.bufindex,
 			    lexer->isgps.curr_offset);
@@ -263,7 +263,7 @@ enum isgpsstat_t isgps_decode(struct gps_lexer_t *lexer,
 		     */
 		    if (lexer->isgps.bufindex >= (unsigned)maxlen) {
 			lexer->isgps.bufindex = 0;
-			gpsd_notify(&lexer->errout, ISGPS_ERRLEVEL_BASE + 1,
+			gpsd_report(&lexer->errout, ISGPS_ERRLEVEL_BASE + 1,
 				    "ISGPS buffer overflowing -- resetting\n");
 			return ISGPS_NO_SYNC;
 		    }
@@ -274,7 +274,7 @@ enum isgpsstat_t isgps_decode(struct gps_lexer_t *lexer,
 		    /* *INDENT-OFF* */
 		    if ((lexer->isgps.bufindex == 0) &&
 			!preamble_match((isgps30bits_t *) lexer->isgps.buf)) {
-			gpsd_notify(&lexer->errout, ISGPS_ERRLEVEL_BASE + 1,
+			gpsd_report(&lexer->errout, ISGPS_ERRLEVEL_BASE + 1,
 				    "ISGPS word 0 not a preamble- punting\n");
 			return ISGPS_NO_SYNC;
 		    }
@@ -298,13 +298,13 @@ enum isgpsstat_t isgps_decode(struct gps_lexer_t *lexer,
 			c >> -(lexer->isgps.curr_offset);
 		}
 	    } else {
-		gpsd_notify(&lexer->errout, ISGPS_ERRLEVEL_BASE + 0,
+		gpsd_report(&lexer->errout, ISGPS_ERRLEVEL_BASE + 0,
 			    "ISGPS parity failure, lost lock\n");
 		lexer->isgps.locked = false;
 	    }
 	}
 	lexer->isgps.curr_offset -= 6;
-	gpsd_notify(&lexer->errout, ISGPS_ERRLEVEL_BASE + 2,
+	gpsd_report(&lexer->errout, ISGPS_ERRLEVEL_BASE + 2,
 		    "ISGPS residual %d\n",
 		    lexer->isgps.curr_offset);
 	return res;
@@ -312,7 +312,7 @@ enum isgpsstat_t isgps_decode(struct gps_lexer_t *lexer,
     /*@ +shiftnegative @*/
 
     /* never achieved lock */
-    gpsd_notify(&lexer->errout, ISGPS_ERRLEVEL_BASE + 1,
+    gpsd_report(&lexer->errout, ISGPS_ERRLEVEL_BASE + 1,
 		"ISGPS lock never achieved\n");
     return ISGPS_NO_SYNC;
 }