Reverse linkage of gpsd_report() is abolished. All regression tests pass.

Some cleanup and testing is still required.

1 files changed, 2 insertions, 11 deletions

diff --git a/gpsctl.c b/gpsctl.c
index a8edf599..08ad274e 100644
--- a/gpsctl.c
+++ b/gpsctl.c
@@ -36,17 +36,6 @@ static bool hunting = true;
  */
 #define REDIRECT_SNIFF	15
 
-void gpsd_report(const int debuglevel, const int errlevel,
-		 const char *fmt, ...)
-{
-    va_list ap;
-
-    va_start(ap, fmt);
-    gpsd_labeled_report(debuglevel, errlevel, "gpsctl:", fmt, ap);
-    va_end(ap);
-			
-}
-
 static void settle(struct gps_device_t *session)
 /* allow the device to settle after a control operation */
 {
@@ -315,6 +304,8 @@ int main(int argc, char **argv)
 	}
     }
 
+    context.errout.label = "gpsctl";
+
     if (optind < argc)
 	device = argv[optind];