gpsd-report() -> gpsd_log()

This change is done so we can add a "log" hook to the pps_thread_t
structure (this is not done yet) and harmonize with the name of the
outer logging function. If that name had been left as gpsd_report()
there would have been scope for bad confusion with the report_hook
member.

Also, remove two stray duplicative printf calls from the NMEA2000 driver
(drivers shouldn't have printfs!) and fix one typo.

This is a step towards factoring out ntplib. For that to happen, the
PPS thread code needs to be decoupled from the core session structure.

No logic changes. Object compatibility preserved. All regression tests pass.

1 files changed, 170 insertions, 170 deletions

diff --git a/driver_nmea0183.c b/driver_nmea0183.c
index 0abb7e8c..f67ec350 100644
--- a/driver_nmea0183.c
+++ b/driver_nmea0183.c
@@ -83,15 +83,15 @@ static void merge_ddmmyy(char *ddmmyy, struct gps_device_t *session)
     year = (session->context->century + yy);
 
     if ( (1 > mon ) || (12 < mon ) ) {
-	gpsd_report(&session->context->errout, LOG_WARN,
-		    "merge_ddmmyy(%s), malformed month\n",  ddmmyy);
+	gpsd_log(&session->context->errout, LOG_WARN,
+		 "merge_ddmmyy(%s), malformed month\n",  ddmmyy);
     } else if ( (1 > mday ) || (31 < mday ) ) {
-	gpsd_report(&session->context->errout, LOG_WARN,
-		    "merge_ddmmyy(%s), malformed day\n",  ddmmyy);
+	gpsd_log(&session->context->errout, LOG_WARN,
+		 "merge_ddmmyy(%s), malformed day\n",  ddmmyy);
     } else {
-	gpsd_report(&session->context->errout, LOG_DATA,
-		    "merge_ddmmyy(%s) sets year %d\n",
-		    ddmmyy, year);
+	gpsd_log(&session->context->errout, LOG_DATA,
+		 "merge_ddmmyy(%s) sets year %d\n",
+		 ddmmyy, year);
 	session->nmea.date.tm_year = year - 1900;
 	session->nmea.date.tm_mon = mon - 1;
 	session->nmea.date.tm_mday = mday;
@@ -120,9 +120,9 @@ static void register_fractional_time(const char *tag, const char *fld,
 	    session->nmea.this_frac_time;
 	session->nmea.this_frac_time = safe_atof(fld);
 	session->nmea.latch_frac_time = true;
-	gpsd_report(&session->context->errout, LOG_DATA,
-		    "%s: registers fractional time %.2f\n",
-		    tag, session->nmea.this_frac_time);
+	gpsd_log(&session->context->errout, LOG_DATA,
+		 "%s: registers fractional time %.2f\n",
+		 tag, session->nmea.this_frac_time);
     }
 }
 
@@ -211,16 +211,16 @@ static gps_mask_t processRMC(int count, char *field[],
 	}
     }
 
-    gpsd_report(&session->context->errout, LOG_DATA,
-		"RMC: ddmmyy=%s hhmmss=%s lat=%.2f lon=%.2f "
-		"speed=%.2f track=%.2f mode=%d status=%d\n",
-		field[9], field[1],
-		session->newdata.latitude,
-		session->newdata.longitude,
-		session->newdata.speed,
-		session->newdata.track,
-		session->newdata.mode,
-		session->gpsdata.status);
+    gpsd_log(&session->context->errout, LOG_DATA,
+	     "RMC: ddmmyy=%s hhmmss=%s lat=%.2f lon=%.2f "
+	     "speed=%.2f track=%.2f mode=%d status=%d\n",
+	     field[9], field[1],
+	     session->newdata.latitude,
+	     session->newdata.longitude,
+	     session->newdata.speed,
+	     session->newdata.track,
+	     session->newdata.mode,
+	     session->gpsdata.status);
     return mask;
 }
 
@@ -267,8 +267,8 @@ static gps_mask_t processGLL(int count, char *field[],
 	merge_hhmmss(field[5], session);
 	register_fractional_time(field[0], field[5], session);
 	if (session->nmea.date.tm_year == 0)
-	    gpsd_report(&session->context->errout, LOG_WARN,
-			"can't use GLL time until after ZDA or RMC has supplied a year.\n");
+	    gpsd_log(&session->context->errout, LOG_WARN,
+		     "can't use GLL time until after ZDA or RMC has supplied a year.\n");
 	else {
 	    mask = TIME_SET;
 	}
@@ -297,13 +297,13 @@ static gps_mask_t processGLL(int count, char *field[],
 	mask |= STATUS_SET;
     }
 
-    gpsd_report(&session->context->errout, LOG_DATA,
-		"GLL: hhmmss=%s lat=%.2f lon=%.2f mode=%d status=%d\n",
-		field[5],
-		session->newdata.latitude,
-		session->newdata.longitude,
-		session->newdata.mode,
-		session->gpsdata.status);
+    gpsd_log(&session->context->errout, LOG_DATA,
+	     "GLL: hhmmss=%s lat=%.2f lon=%.2f mode=%d status=%d\n",
+	     field[5],
+	     session->newdata.latitude,
+	     session->newdata.longitude,
+	     session->newdata.mode,
+	     session->gpsdata.status);
     return mask;
 }
 
@@ -357,8 +357,8 @@ static gps_mask_t processGGA(int c UNUSED, char *field[],
 	merge_hhmmss(field[1], session);
 	register_fractional_time(field[0], field[1], session);
 	if (session->nmea.date.tm_year == 0)
-	    gpsd_report(&session->context->errout, LOG_WARN,
-			"can't use GGA time until after ZDA or RMC has supplied a year.\n");
+	    gpsd_log(&session->context->errout, LOG_WARN,
+		     "can't use GGA time until after ZDA or RMC has supplied a year.\n");
 	else {
 	    mask |= TIME_SET;
 	}
@@ -399,14 +399,14 @@ static gps_mask_t processGGA(int c UNUSED, char *field[],
 				 session->newdata.longitude);
 	}
     }
-    gpsd_report(&session->context->errout, LOG_DATA,
-		"GGA: hhmmss=%s lat=%.2f lon=%.2f alt=%.2f mode=%d status=%d\n",
-		field[1],
-		session->newdata.latitude,
-		session->newdata.longitude,
-		session->newdata.altitude,
-		session->newdata.mode,
-		session->gpsdata.status);
+    gpsd_log(&session->context->errout, LOG_DATA,
+	     "GGA: hhmmss=%s lat=%.2f lon=%.2f alt=%.2f mode=%d status=%d\n",
+	     field[1],
+	     session->newdata.latitude,
+	     session->newdata.longitude,
+	     session->newdata.altitude,
+	     session->newdata.mode,
+	     session->gpsdata.status);
     return mask;
 }
 
@@ -442,16 +442,16 @@ static gps_mask_t processGST(int count, char *field[], struct gps_device_t *sess
 #undef PARSE_FIELD
     register_fractional_time(field[0], field[1], session);
 
-    gpsd_report(&session->context->errout, LOG_DATA,
-		"GST: utc = %.2f, rms = %.2f, maj = %.2f, min = %.2f, ori = %.2f, lat = %.2f, lon = %.2f, alt = %.2f\n",
-                session->gpsdata.gst.utctime,
-                session->gpsdata.gst.rms_deviation,
-                session->gpsdata.gst.smajor_deviation,
-                session->gpsdata.gst.sminor_deviation,
-                session->gpsdata.gst.smajor_orientation,
-                session->gpsdata.gst.lat_err_deviation,
-                session->gpsdata.gst.lon_err_deviation,
-                session->gpsdata.gst.alt_err_deviation);
+    gpsd_log(&session->context->errout, LOG_DATA,
+	     "GST: utc = %.2f, rms = %.2f, maj = %.2f, min = %.2f, ori = %.2f, lat = %.2f, lon = %.2f, alt = %.2f\n",
+	     session->gpsdata.gst.utctime,
+	     session->gpsdata.gst.rms_deviation,
+	     session->gpsdata.gst.smajor_deviation,
+	     session->gpsdata.gst.sminor_deviation,
+	     session->gpsdata.gst.smajor_orientation,
+	     session->gpsdata.gst.lat_err_deviation,
+	     session->gpsdata.gst.lon_err_deviation,
+	     session->gpsdata.gst.alt_err_deviation);
 
     return GST_SET | ONLINE_SET;
 }
@@ -532,8 +532,8 @@ static gps_mask_t processGSA(int count, char *field[],
      * Alarmingly, it's possible this error may be generic to SiRFstarIII.
      */
     if (count < 17) {
-	gpsd_report(&session->context->errout, LOG_DATA,
-		    "GPGSA: malformed, setting ONLINE_SET only.\n");
+	gpsd_log(&session->context->errout, LOG_DATA,
+		 "GPGSA: malformed, setting ONLINE_SET only.\n");
 	mask = ONLINE_SET;
     } else if (session->nmea.latch_mode) {
 	/* last GGA had a non-advancing timestamp; don't trust this GSA */
@@ -550,8 +550,8 @@ static gps_mask_t processGSA(int count, char *field[],
 	    mask = 0;
 	else
 	    mask = MODE_SET;
-	gpsd_report(&session->context->errout, LOG_PROG,
-		    "GPGSA sets mode %d\n", session->newdata.mode);
+	gpsd_log(&session->context->errout, LOG_PROG,
+		 "GPGSA sets mode %d\n", session->newdata.mode);
 	if (field[15][0] != '\0')
 	    session->gpsdata.dop.pdop = safe_atof(field[15]);
 	if (field[16][0] != '\0')
@@ -568,13 +568,13 @@ static gps_mask_t processGSA(int count, char *field[],
 		    (unsigned short)prn;
 	}
 	mask |= DOP_SET | USED_IS;
-	gpsd_report(&session->context->errout, LOG_DATA,
-		    "GPGSA: mode=%d used=%d pdop=%.2f hdop=%.2f vdop=%.2f\n",
-		    session->newdata.mode,
-		    session->gpsdata.satellites_used,
-		    session->gpsdata.dop.pdop,
-		    session->gpsdata.dop.hdop,
-		    session->gpsdata.dop.vdop);
+	gpsd_log(&session->context->errout, LOG_DATA,
+		 "GPGSA: mode=%d used=%d pdop=%.2f hdop=%.2f vdop=%.2f\n",
+		 session->newdata.mode,
+		 session->gpsdata.satellites_used,
+		 session->gpsdata.dop.pdop,
+		 session->gpsdata.dop.hdop,
+		 session->gpsdata.dop.vdop);
     }
     return mask;
 }
@@ -606,17 +606,17 @@ static gps_mask_t processGSV(int count, char *field[],
      */
     int n, fldnum;
     if (count <= 3) {
-	gpsd_report(&session->context->errout, LOG_WARN,
-		    "malformed GPGSV - fieldcount %d <= 3\n",
-		    count);
+	gpsd_log(&session->context->errout, LOG_WARN,
+		 "malformed GPGSV - fieldcount %d <= 3\n",
+		 count);
 	gpsd_zero_satellites(&session->gpsdata);
 	session->gpsdata.satellites_visible = 0;
 	return ONLINE_SET;
     }
     if (count % 4 != 0) {
-	gpsd_report(&session->context->errout, LOG_WARN,
-		    "malformed GPGSV - fieldcount %d %% 4 != 0\n",
-		    count);
+	gpsd_log(&session->context->errout, LOG_WARN,
+		 "malformed GPGSV - fieldcount %d %% 4 != 0\n",
+		 count);
 	gpsd_zero_satellites(&session->gpsdata);
 	session->gpsdata.satellites_visible = 0;
 	return ONLINE_SET;
@@ -624,7 +624,8 @@ static gps_mask_t processGSV(int count, char *field[],
 
     session->nmea.await = atoi(field[1]);
     if ((session->nmea.part = atoi(field[2])) < 1) {
-	gpsd_report(&session->context->errout, LOG_WARN, "malformed GPGSV - bad part\n");
+	gpsd_log(&session->context->errout, LOG_WARN,
+		 "malformed GPGSV - bad part\n");
 	gpsd_zero_satellites(&session->gpsdata);
 	return ONLINE_SET;
     } else if (session->nmea.part == 1) {
@@ -647,9 +648,9 @@ static gps_mask_t processGSV(int count, char *field[],
     for (fldnum = 4; fldnum < count;) {
 	struct satellite_t *sp;
 	if (session->gpsdata.satellites_visible >= MAXCHANNELS) {
-	    gpsd_report(&session->context->errout, LOG_ERROR,
-			"internal error - too many satellites [%d]!\n",
-                    session->gpsdata.satellites_visible);
+	    gpsd_log(&session->context->errout, LOG_ERROR,
+		     "internal error - too many satellites [%d]!\n",
+		     session->gpsdata.satellites_visible);
 	    gpsd_zero_satellites(&session->gpsdata);
 	    break;
 	}
@@ -676,15 +677,15 @@ static gps_mask_t processGSV(int count, char *field[],
     }
     if (session->nmea.part == session->nmea.await
 	&& atoi(field[3]) != session->gpsdata.satellites_visible)
-	gpsd_report(&session->context->errout, LOG_WARN,
-		    "GPGSV field 3 value of %d != actual count %d\n",
-		    atoi(field[3]), session->gpsdata.satellites_visible);
+	gpsd_log(&session->context->errout, LOG_WARN,
+		 "GPGSV field 3 value of %d != actual count %d\n",
+		 atoi(field[3]), session->gpsdata.satellites_visible);
 
     /* not valid data until we've seen a complete set of parts */
     if (session->nmea.part < session->nmea.await) {
-	gpsd_report(&session->context->errout, LOG_PROG,
-		    "Partial satellite data (%d of %d).\n",
-		    session->nmea.part, session->nmea.await);
+	gpsd_log(&session->context->errout, LOG_PROG,
+		 "Partial satellite data (%d of %d).\n",
+		 session->nmea.part, session->nmea.await);
 	return ONLINE_SET;
     }
     /*
@@ -698,16 +699,16 @@ static gps_mask_t processGSV(int count, char *field[],
     for (n = 0; n < session->gpsdata.satellites_visible; n++)
 	if (session->gpsdata.skyview[n].azimuth != 0)
 	    goto sane;
-    gpsd_report(&session->context->errout, LOG_WARN,
-		"Satellite data no good (%d of %d).\n",
-		session->nmea.part, session->nmea.await);
+    gpsd_log(&session->context->errout, LOG_WARN,
+	     "Satellite data no good (%d of %d).\n",
+	     session->nmea.part, session->nmea.await);
     gpsd_zero_satellites(&session->gpsdata);
     return ONLINE_SET;
   sane:
     session->gpsdata.skyview_time = NAN;
-    gpsd_report(&session->context->errout, LOG_DATA,
-		"GSV: Satellite data OK (%d of %d).\n",
-		session->nmea.part, session->nmea.await);
+    gpsd_log(&session->context->errout, LOG_DATA,
+	     "GSV: Satellite data OK (%d of %d).\n",
+	     session->nmea.part, session->nmea.await);
 
     /* assumes GLGSV or BDGSV group, if present, is emitted after the GPGSV */
     if ((session->nmea.seen_glgsv || session->nmea.seen_bdgsv || session->nmea.seen_qzss) && GSV_TALKER == 'P')
@@ -752,11 +753,11 @@ static gps_mask_t processPGRME(int c UNUSED, char *field[],
 	mask = HERR_SET | VERR_SET | PERR_IS;
     }
 
-    gpsd_report(&session->context->errout, LOG_DATA,
-		"PGRME: epx=%.2f epy=%.2f epv=%.2f\n",
-		session->newdata.epx,
-		session->newdata.epy,
-		session->newdata.epv);
+    gpsd_log(&session->context->errout, LOG_DATA,
+	     "PGRME: epx=%.2f epy=%.2f epv=%.2f\n",
+	     session->newdata.epx,
+	     session->newdata.epy,
+	     session->newdata.epv);
     return mask;
 }
 
@@ -787,15 +788,15 @@ static gps_mask_t processGBS(int c UNUSED, char *field[],
 	session->newdata.epy = safe_atof(field[2]);
 	session->newdata.epx = safe_atof(field[3]);
 	session->newdata.epv = safe_atof(field[4]);
-	gpsd_report(&session->context->errout, LOG_DATA,
-		    "GBS: epx=%.2f epy=%.2f epv=%.2f\n",
-		    session->newdata.epx,
-		    session->newdata.epy,
-		    session->newdata.epv);
+	gpsd_log(&session->context->errout, LOG_DATA,
+		 "GBS: epx=%.2f epy=%.2f epv=%.2f\n",
+		 session->newdata.epx,
+		 session->newdata.epy,
+		 session->newdata.epv);
 	return HERR_SET | VERR_SET;
     } else {
-	gpsd_report(&session->context->errout, LOG_PROG,
-		    "second in $GPGBS error estimates doesn't match.\n");
+	gpsd_log(&session->context->errout, LOG_PROG,
+		 "second in $GPGBS error estimates doesn't match.\n");
 	return 0;
     }
 }
@@ -822,7 +823,7 @@ static gps_mask_t processZDA(int c UNUSED, char *field[],
 
     if (field[1][0] == '\0' || field[2][0] == '\0' || field[3][0] == '\0'
 	|| field[4][0] == '\0') {
-	gpsd_report(&session->context->errout, LOG_WARN, "ZDA fields are empty\n");
+	gpsd_log(&session->context->errout, LOG_WARN, "ZDA fields are empty\n");
     } else {
     	int year, mon, mday, century;
 
@@ -838,14 +839,14 @@ static gps_mask_t processZDA(int c UNUSED, char *field[],
 	mday = atoi(field[2]);
 	century = year - year % 100;
 	if ( (1900 > year ) || (2200 < year ) ) {
-	    gpsd_report(&session->context->errout, LOG_WARN,
-			"malformed ZDA year: %s\n",  field[4]);
+	    gpsd_log(&session->context->errout, LOG_WARN,
+		     "malformed ZDA year: %s\n",  field[4]);
 	} else if ( (1 > mon ) || (12 < mon ) ) {
-	    gpsd_report(&session->context->errout, LOG_WARN,
-			"malformed ZDA month: %s\n",  field[3]);
+	    gpsd_log(&session->context->errout, LOG_WARN,
+		     "malformed ZDA month: %s\n",  field[3]);
 	} else if ( (1 > mday ) || (31 < mday ) ) {
-	    gpsd_report(&session->context->errout, LOG_WARN,
-			"malformed ZDA day: %s\n",  field[2]);
+	    gpsd_log(&session->context->errout, LOG_WARN,
+		     "malformed ZDA day: %s\n",  field[2]);
 	} else {
 	    gpsd_century_update(session, century);
 	    session->nmea.date.tm_year = year - 1900;
@@ -895,10 +896,10 @@ static gps_mask_t processHDT(int c UNUSED, char *field[],
     session->gpsdata.attitude.depth = NAN;
     mask |= (ATTITUDE_SET);
 
-    gpsd_report(&session->context->errout, LOG_RAW,
-		"time %.3f, heading %lf.\n",
-		session->newdata.time,
-		session->gpsdata.attitude.heading);
+    gpsd_log(&session->context->errout, LOG_RAW,
+	     "time %.3f, heading %lf.\n",
+	     session->newdata.time,
+	     session->gpsdata.attitude.heading);
     return mask;
 }
 
@@ -943,10 +944,10 @@ static gps_mask_t processDBT(int c UNUSED, char *field[],
      * no better place to put it.  Should work in practice as nobody is
      * likely to be operating a depth sounder at varying altitudes.
      */
-    gpsd_report(&session->context->errout, LOG_RAW,
-		"mode %d, depth %lf.\n",
-		session->newdata.mode,
-		session->newdata.altitude);
+    gpsd_log(&session->context->errout, LOG_RAW,
+	     "mode %d, depth %lf.\n",
+	     session->newdata.mode,
+	     session->newdata.altitude);
     return mask;
 }
 
@@ -1010,11 +1011,11 @@ static gps_mask_t processTNTHTM(int c UNUSED, char *field[],
     session->gpsdata.attitude.depth = NAN;
     mask |= (ATTITUDE_SET);
 
-    gpsd_report(&session->context->errout, LOG_RAW,
-		"time %.3f, heading %lf (%c).\n",
-		session->newdata.time,
-		session->gpsdata.attitude.heading,
-		session->gpsdata.attitude.mag_st);
+    gpsd_log(&session->context->errout, LOG_RAW,
+	     "time %.3f, heading %lf (%c).\n",
+	     session->newdata.time,
+	     session->gpsdata.attitude.heading,
+	     session->gpsdata.attitude.mag_st);
     return mask;
 }
 #endif /* TNT_ENABLE */
@@ -1069,8 +1070,8 @@ static gps_mask_t processOHPR(int c UNUSED, char *field[],
     session->gpsdata.attitude.gyro_y = safe_atof(field[16]);
     mask |= (ATTITUDE_SET);
 
-    gpsd_report(&session->context->errout, LOG_RAW,
-		"Heading %lf.\n", session->gpsdata.attitude.heading);
+    gpsd_log(&session->context->errout, LOG_RAW,
+	     "Heading %lf.\n", session->gpsdata.attitude.heading);
     return mask;
 }
 #endif /* OCEANSERVER_ENABLE */
@@ -1085,9 +1086,9 @@ static gps_mask_t processPASHR(int c UNUSED, char *field[],
     if (0 == strcmp("RID", field[1])) {	/* Receiver ID */
 	(void)snprintf(session->subtype, sizeof(session->subtype) - 1,
 		       "%s ver %s", field[2], field[3]);
-	gpsd_report(&session->context->errout, LOG_DATA,
-		    "PASHR,RID: subtype=%s mask={}\n",
-		    session->subtype);
+	gpsd_log(&session->context->errout, LOG_DATA,
+		 "PASHR,RID: subtype=%s mask={}\n",
+		 session->subtype);
 	return mask;
     } else if (0 == strcmp("POS", field[1])) {	/* 3D Position */
 	mask |= MODE_SET | STATUS_SET | CLEAR_IS;
@@ -1118,15 +1119,15 @@ static gps_mask_t processPASHR(int c UNUSED, char *field[],
 	    mask |= (TIME_SET | LATLON_SET | ALTITUDE_SET);
 	    mask |= (SPEED_SET | TRACK_SET | CLIMB_SET);
 	    mask |= DOP_SET;
-	    gpsd_report(&session->context->errout, LOG_DATA,
-			"PASHR,POS: hhmmss=%s lat=%.2f lon=%.2f alt=%.f speed=%.2f track=%.2f climb=%.2f mode=%d status=%d pdop=%.2f hdop=%.2f vdop=%.2f tdop=%.2f\n",
-			field[4], session->newdata.latitude,
-			session->newdata.longitude, session->newdata.altitude,
-			session->newdata.speed, session->newdata.track,
-			session->newdata.climb, session->newdata.mode,
-			session->gpsdata.status, session->gpsdata.dop.pdop,
-			session->gpsdata.dop.hdop, session->gpsdata.dop.vdop,
-			session->gpsdata.dop.tdop);
+	    gpsd_log(&session->context->errout, LOG_DATA,
+		     "PASHR,POS: hhmmss=%s lat=%.2f lon=%.2f alt=%.f speed=%.2f track=%.2f climb=%.2f mode=%d status=%d pdop=%.2f hdop=%.2f vdop=%.2f tdop=%.2f\n",
+		     field[4], session->newdata.latitude,
+		     session->newdata.longitude, session->newdata.altitude,
+		     session->newdata.speed, session->newdata.track,
+		     session->newdata.climb, session->newdata.mode,
+		     session->gpsdata.status, session->gpsdata.dop.pdop,
+		     session->gpsdata.dop.hdop, session->gpsdata.dop.vdop,
+		     session->gpsdata.dop.tdop);
 	}
     } else if (0 == strcmp("SAT", field[1])) {	/* Satellite Status */
 	struct satellite_t *sp;
@@ -1143,9 +1144,9 @@ static gps_mask_t processPASHR(int c UNUSED, char *field[],
 		session->gpsdata.satellites_used++;
 	    }
 	}
-	gpsd_report(&session->context->errout, LOG_DATA,
-		    "PASHR,SAT: used=%d\n",
-		    session->gpsdata.satellites_used);
+	gpsd_log(&session->context->errout, LOG_DATA,
+		 "PASHR,SAT: used=%d\n",
+		 session->gpsdata.satellites_used);
 	session->gpsdata.skyview_time = NAN;
 	mask |= SATELLITE_SET | USED_IS;
     }
@@ -1220,8 +1221,8 @@ static gps_mask_t processMTK3301(int c UNUSED, char *field[],
     case 001:			/* ACK / NACK */
 	reason = atoi(field[2]);
 	if (atoi(field[1]) == -1)
-	    gpsd_report(&session->context->errout, LOG_WARN,
-			"MTK NACK: unknown sentence\n");
+	    gpsd_log(&session->context->errout, LOG_WARN,
+		     "MTK NACK: unknown sentence\n");
 	else if (reason < 3) {
 	    const char *mtk_reasons[] = {
 		"Invalid",
@@ -1229,14 +1230,13 @@ static gps_mask_t processMTK3301(int c UNUSED, char *field[],
 		"Valid but Failed",
 		"Valid success"
 	    };
-	    gpsd_report(&session->context->errout, LOG_WARN,
-			"MTK NACK: %s, reason: %s\n",
-			field[1],
-			mtk_reasons[reason]);
+	    gpsd_log(&session->context->errout, LOG_WARN,
+		     "MTK NACK: %s, reason: %s\n",
+		     field[1], mtk_reasons[reason]);
 	}
 	else
-	    gpsd_report(&session->context->errout, LOG_WARN,
-			"MTK ACK: %s\n", field[1]);
+	    gpsd_log(&session->context->errout, LOG_WARN,
+		     "MTK ACK: %s\n", field[1]);
 	return ONLINE_SET;
     default:
 	return ONLINE_SET;		/* ignore */
@@ -1325,9 +1325,9 @@ gps_mask_t nmea_parse(char *sentence, struct gps_device_t * session)
      * packets.  This may be a generic bug of all Garmin chipsets.
      */
     if (strlen(sentence) > NMEA_MAX) {
-	gpsd_report(&session->context->errout, LOG_WARN,
-		    "Overlong packet of %zd chars rejected.\n",
-		    strlen(sentence));
+	gpsd_log(&session->context->errout, LOG_WARN,
+		 "Overlong packet of %zd chars rejected.\n",
+		 strlen(sentence));
 	return ONLINE_SET;
     }
 
@@ -1406,15 +1406,15 @@ gps_mask_t nmea_parse(char *sentence, struct gps_device_t * session)
 	 * WARNING: This assumes time is always field 0, and that field 0
 	 * is a timestamp whenever TIME_SET is set.
 	 */
-	gpsd_report(&session->context->errout, LOG_DATA,
-		    "%s time is %2f = %d-%02d-%02dT%02d:%02d:%02.2fZ\n",
-		    session->nmea.field[0], session->newdata.time,
-		    1900 + session->nmea.date.tm_year,
-		    session->nmea.date.tm_mon + 1,
-		    session->nmea.date.tm_mday,
-		    session->nmea.date.tm_hour,
-		    session->nmea.date.tm_min,
-		    session->nmea.date.tm_sec + session->nmea.subseconds);
+	gpsd_log(&session->context->errout, LOG_DATA,
+		 "%s time is %2f = %d-%02d-%02dT%02d:%02d:%02.2fZ\n",
+		 session->nmea.field[0], session->newdata.time,
+		 1900 + session->nmea.date.tm_year,
+		 session->nmea.date.tm_mon + 1,
+		 session->nmea.date.tm_mday,
+		 session->nmea.date.tm_hour,
+		 session->nmea.date.tm_min,
+		 session->nmea.date.tm_sec + session->nmea.subseconds);
 	/*
 	 * If we have time and PPS is available, assume we have good time.
 	 * Because this is a generic driver we don't really have enough
@@ -1436,18 +1436,18 @@ gps_mask_t nmea_parse(char *sentence, struct gps_device_t * session)
      * mid-cycle, as in the Garmin eXplorist 210; those might jitter.
      */
     if (session->nmea.latch_frac_time) {
-	gpsd_report(&session->context->errout, LOG_PROG,
-		    "%s sentence timestamped %.2f.\n",
-		    session->nmea.field[0],
-		    session->nmea.this_frac_time);
+	gpsd_log(&session->context->errout, LOG_PROG,
+		 "%s sentence timestamped %.2f.\n",
+		 session->nmea.field[0],
+		 session->nmea.this_frac_time);
 	if (!GPS_TIME_EQUAL
 	    (session->nmea.this_frac_time,
 	     session->nmea.last_frac_time)) {
 	    uint lasttag = session->nmea.lasttag;
 	    retval |= CLEAR_IS;
-	    gpsd_report(&session->context->errout, LOG_PROG,
-			"%s starts a reporting cycle.\n",
-			session->nmea.field[0]);
+	    gpsd_log(&session->context->errout, LOG_PROG,
+		     "%s starts a reporting cycle.\n",
+		     session->nmea.field[0]);
 	    /*
 	     * Have we seen a previously timestamped NMEA tag?
 	     * If so, designate as end-of-cycle marker.
@@ -1458,21 +1458,21 @@ gps_mask_t nmea_parse(char *sentence, struct gps_device_t * session)
 		&& (session->nmea.cycle_enders & (1 << lasttag)) == 0
 		&& !session->nmea.cycle_continue) {
 		session->nmea.cycle_enders |= (1 << lasttag);
-		gpsd_report(&session->context->errout, LOG_PROG,
-			    "tagged %s as a cycle ender.\n",
-			    nmea_phrase[lasttag - 1].name);
+		gpsd_log(&session->context->errout, LOG_PROG,
+			 "tagged %s as a cycle ender.\n",
+			 nmea_phrase[lasttag - 1].name);
 	    }
 	}
     } else {
 	/* extend the cycle to an un-timestamped sentence? */
 	if ((session->nmea.lasttag & session->nmea.cycle_enders) != 0)
-	    gpsd_report(&session->context->errout, LOG_PROG,
-			"%s is just after a cycle ender.\n",
-			session->nmea.field[0]);
+	    gpsd_log(&session->context->errout, LOG_PROG,
+		     "%s is just after a cycle ender.\n",
+		     session->nmea.field[0]);
 	if (session->nmea.cycle_continue) {
-	    gpsd_report(&session->context->errout, LOG_PROG,
-			"%s extends the reporting cycle.\n",
-			session->nmea.field[0]);
+	    gpsd_log(&session->context->errout, LOG_PROG,
+		     "%s extends the reporting cycle.\n",
+		     session->nmea.field[0]);
 	    session->nmea.cycle_enders &=~ (1 << session->nmea.lasttag);
 	    session->nmea.cycle_enders |= (1 << thistag);
 	}
@@ -1480,9 +1480,9 @@ gps_mask_t nmea_parse(char *sentence, struct gps_device_t * session)
     /* here's where we check for end-of-cycle */
     if ((session->nmea.latch_frac_time || session->nmea.cycle_continue)
 	&& (session->nmea.cycle_enders & (1 << thistag))!=0) {
-	gpsd_report(&session->context->errout, LOG_PROG,
-		    "%s ends a reporting cycle.\n",
-		    session->nmea.field[0]);
+	gpsd_log(&session->context->errout, LOG_PROG,
+		 "%s ends a reporting cycle.\n",
+		 session->nmea.field[0]);
 	retval |= REPORT_IS;
     }
     if (session->nmea.latch_frac_time)