Cut down on gpsd_hexdump_wrapper() calls.

This awkward construct seems to have triggered some sort of toolchain
bug.  The symptom is that gpsd_hexdump_level has different values depending
on whether we test it inside or outside of hex.c.

As a first step towards eliminating this global, we throw out a bunch
of hex logging that is duplicative or not really needed for production
drivers. Experimental drivers can call the hex dumper unconditionally.

The goal is to reduce the number of uses of this variable to eliminate it
withoud doing violence to the internal APIs. This is a first step.

All regression tests pass.

13 files changed, 37 insertions, 100 deletions

diff --git a/driver_evermore.c b/driver_evermore.c
index ad5f703f..f5e31c4c 100644
--- a/driver_evermore.c
+++ b/driver_evermore.c
@@ -157,10 +157,6 @@ gps_mask_t evermore_parse(struct gps_device_t * session, unsigned char *buf,
     if (*cp == 0x10)
 	cp++;
     datalen = (size_t) * cp++;
-
-    gpsd_report(LOG_RAW, "raw EverMore packet type 0x%02x, length %zd: %s\n",
-		*cp, len, gpsd_hexdump_wrapper(buf, len, LOG_RAW));
-
     datalen -= 2;
 
     /*@ -usedef @*/
@@ -363,13 +359,11 @@ gps_mask_t evermore_parse(struct gps_device_t * session, unsigned char *buf,
 	return TIME_SET | PPSTIME_IS | RAW_IS;
 
     case 0x20:			/* LogConfig Info, could be used as a probe for EverMore GPS */
-	gpsd_report(LOG_IO, "LogConfig EverMore packet, length %zd: %s\n",
-		    datalen, gpsd_hexdump_wrapper(buf2, datalen, LOG_IO));
+	gpsd_report(LOG_IO, "LogConfig EverMore packet, length %zd\n", datalen);
 	return ONLINE_SET;
 
     case 0x22:			/* LogData */
-	gpsd_report(LOG_IO, "LogData EverMore packet, length %zd: %s\n",
-		    datalen, gpsd_hexdump_wrapper(buf2, datalen, LOG_IO));
+	gpsd_report(LOG_IO, "LogData EverMore packet, length %zd\n", datalen);
 	return ONLINE_SET;
 
     case 0x38:			/* ACK */
@@ -378,9 +372,8 @@ gps_mask_t evermore_parse(struct gps_device_t * session, unsigned char *buf,
 
     default:
 	gpsd_report(LOG_WARN,
-		    "unknown EverMore packet EID 0x%02x, length %zd: %s\n",
-		    buf2[0], datalen, gpsd_hexdump_wrapper(buf2, datalen,
-							   LOG_WARN));
+		    "unknown EverMore packet EID 0x%02x, length %zd\n",
+		    buf2[0], datalen);
 	return 0;
     }
 }
diff --git a/driver_garmin.c b/driver_garmin.c
index e2221abb..afe9546b 100644
--- a/driver_garmin.c
+++ b/driver_garmin.c
@@ -586,10 +586,8 @@ gps_mask_t PrintSERPacket(struct gps_device_t *session, unsigned char pkt_id,
 	break;
     default:
 	gpsd_report(LOG_WARN,
-		    "Garmin: Unknown packet id: %#02x, Sz: %#02x, pkt:%s\n",
-		    pkt_id, pkt_len, gpsd_hexdump_wrapper(buf,
-							  (size_t) pkt_len,
-							  LOG_WARN));
+		    "Garmin: Unknown packet id: %#02x, Sz: %#02x\n",
+		    pkt_id, pkt_len);
 	break;
     }
     gpsd_report(LOG_IO, "Garmin: PrintSERPacket(, %#02x, %#02x, )\n",
@@ -720,11 +718,6 @@ static void Build_Send_USB_Packet(struct gps_device_t *session,
     } else if (4 == length) {
 	set_int32(buffer + 12, data);
     }
-#if 0
-    gpsd_report(LOG_IO, "Garmin: SendPacket(), writing %d bytes: %s\n",
-		theBytesToWrite,
-		gpsd_hexdump_wrapper(thePacket, theBytesToWrite, LOG_IO));
-#endif
     (void)PrintUSBPacket(session, thePacket);
 
     theBytesReturned = gpsd_write(session, (const char *)thePacket,
@@ -795,12 +788,6 @@ static void Build_Send_SER_Packet(struct gps_device_t *session,
     /* we used to say n++ here, but scan-build complains */
     *buffer = (uint8_t) ETX;
 
-#if 1
-    gpsd_report(LOG_IO, "Garmin: SendPacket(), writing %zd bytes: %s\n",
-		theBytesToWrite,
-		gpsd_hexdump_wrapper(thePacket, (size_t) theBytesToWrite,
-				     LOG_IO));
-#endif
     (void)PrintSERPacket(session,
 			 (unsigned char)buffer0[1],
 			 (int)buffer0[2], (unsigned char *)(buffer0 + 3));
@@ -1266,12 +1253,6 @@ static int GetPacket(struct gps_device_t *session)
 	    continue;
 	}
 	gpsd_report(LOG_RAW, "Garmin: got %d bytes\n", theBytesReturned);
-#if 1
-	gpsd_report(LOG_IO, "Garmin: getPacket(), got %d bytes: %s\n",
-		    theBytesReturned,
-		    gpsd_hexdump_wrapper(thePacket, theBytesReturned,
-					 LOG_IO));
-#endif
 
 	session->driver.garmin.BufferLen += theBytesReturned;
 	if (256 <= session->driver.garmin.BufferLen) {
diff --git a/driver_garmin_txt.c b/driver_garmin_txt.c
index d53dd57e..f2b4a883 100644
--- a/driver_garmin_txt.c
+++ b/driver_garmin_txt.c
@@ -263,11 +263,8 @@ gps_mask_t garmintxt_parse(struct gps_device_t * session)
 
     gps_mask_t mask = 0;
 
-    gpsd_report(LOG_PROG, "Garmin Simple Text packet, len %zd\n",
-		session->packet.outbuflen);
-    gpsd_report(LOG_RAW, "%s\n",
-		gpsd_hexdump_wrapper(session->packet.outbuffer,
-				     session->packet.outbuflen, LOG_RAW));
+    gpsd_report(LOG_PROG, "Garmin Simple Text packet, len %zd: %s\n",
+		session->packet.outbuflen, (char*)session->packet.outbuffer);
 
     if (session->packet.outbuflen < 54) {
 	/* trailing CR and LF can be ignored; ('@' + 54x 'DATA' + '\r\n') has length 57 */
diff --git a/driver_geostar.c b/driver_geostar.c
index 3d044541..0d56b233 100644
--- a/driver_geostar.c
+++ b/driver_geostar.c
@@ -68,9 +68,7 @@ static int geostar_write(struct gps_device_t *session,
 
     session->msgbuflen = len * 4;
 
-    gpsd_report(LOG_IO, "Sent GeoStar packet id 0x%x: %s\n", id,
-		gpsd_hexdump_wrapper(session->msgbuf, session->msgbuflen, LOG_IO));
-
+    gpsd_report(LOG_IO, "Sent GeoStar packet id 0x%x\n", id);
     if (gpsd_write(session, session->msgbuf, session->msgbuflen) !=
 	(ssize_t) session->msgbuflen)
 	return -1;
diff --git a/driver_navcom.c b/driver_navcom.c
index 2a6c939b..aa78c2f9 100644
--- a/driver_navcom.c
+++ b/driver_navcom.c
@@ -80,8 +80,6 @@ static uint8_t checksum(unsigned char *buf, size_t len)
 static bool navcom_send_cmd(struct gps_device_t *session, unsigned char *cmd,
 			    size_t len)
 {
-    gpsd_report(LOG_RAW, "Navcom: command dump: %s\n",
-		gpsd_hexdump_wrapper(cmd, len, LOG_RAW));
     return (gpsd_write(session, (const char *)cmd, len) == (ssize_t) len);
 }
 
@@ -1206,9 +1204,6 @@ static ssize_t navcom_control_send(struct gps_device_t *session,
     putbyte(session->msgbuf, 7 + len, 0x03);
     session->msgbuflen = len + 9;
     /*@ -ignoresigns +mayaliasunique @*/
-    gpsd_report(LOG_RAW, "Navcom: control dump: %s\n",
-		gpsd_hexdump_wrapper(session->msgbuf, session->msgbuflen,
-				     LOG_RAW));
     return gpsd_write(session, session->msgbuf, session->msgbuflen);
 }
 #endif /* CONTROLSEND_ENABLE */
diff --git a/driver_oncore.c b/driver_oncore.c
index a23b610e..b6b019b7 100644
--- a/driver_oncore.c
+++ b/driver_oncore.c
@@ -388,10 +388,8 @@ gps_mask_t oncore_dispatch(struct gps_device_t * session, unsigned char *buf,
 
     default:
 	/* FIX-ME: This gets noisy in a hurry. Change once your driver works */
-	gpsd_report(LOG_WARN, "unknown packet id @@%c%c length %zd: %s\n",
-		    type >> 8, type & 0xff, len, gpsd_hexdump_wrapper(buf,
-								      len,
-								      LOG_WARN));
+	gpsd_report(LOG_WARN, "unknown packet id @@%c%c length %zd\n",
+		    type >> 8, type & 0xff, len);
 	return 0;
     }
 }
@@ -424,10 +422,7 @@ static ssize_t oncore_control_send(struct gps_device_t *session,
     session->msgbuf[msglen + 4] = '\n';
     session->msgbuflen = msglen + 5;
 
-    gpsd_report(LOG_IO, "writing oncore control type %c%c:%s\n",
-		msg[0], msg[1], gpsd_hexdump_wrapper(session->msgbuf,
-						     session->msgbuflen,
-						     LOG_IO));
+    gpsd_report(LOG_IO, "writing oncore control type %c%c\n", msg[0], msg[1]);
     return gpsd_write(session, session->msgbuf, session->msgbuflen);
 }
 
diff --git a/driver_proto.c b/driver_proto.c
index 85075560..8d13b578 100644
--- a/driver_proto.c
+++ b/driver_proto.c
@@ -300,9 +300,7 @@ gps_mask_t _proto__dispatch(struct gps_device_t *session, unsigned char *buf, si
 	/* Deliver message to specific decoder based on message type */
 
     default:
-	/* This gets noisy in a hurry. Change once your driver works */
-	gpsd_report(LOG_WARN, "unknown packet id %d length %d: %s\n",
-	    type, len, gpsd_hexdump_wrapper(buf, len, LOG_WARN));
+	gpsd_report(LOG_WARN, "unknown packet id %d length %d\n", type, len);
 	return 0;
     }
 }
@@ -352,8 +350,7 @@ static ssize_t _proto__control_send(struct gps_device_t *session,
 
    /* we may need to dump the message */
     return gpsd_write(session, session->msgbuf, session->msgbuflen);
-   gpsd_report(LOG_IO, "writing _proto_ control type %02x:%s\n",
-	       msg[0], gpsd_hexdump_wrapper(session->msgbuf, session->msgbuflen, LOG_IO));
+   gpsd_report(LOG_IO, "writing _proto_ control type %02x\n");
    return gpsd_write(session, session->msgbuf, session->msgbuflen);
 }
 /*@ -charint +usedef +compdef @*/
diff --git a/driver_rtcm3.c b/driver_rtcm3.c
index 15920a5c..c39d3450 100644
--- a/driver_rtcm3.c
+++ b/driver_rtcm3.c
@@ -96,9 +96,8 @@ void rtcm3_unpack( /*@out@*/ struct rtcm3_t *rtcm, char *buf)
     rtcm->length = (uint)ugrab(10);
     rtcm->type = (uint)ugrab(12);
 
-    gpsd_report(LOG_RAW, "RTCM3: type %d payload length %d: %s\n",
-		rtcm->type, rtcm->length, 
-		gpsd_hexdump_wrapper(buf+3, rtcm->length, LOG_RAW));
+    gpsd_report(LOG_RAW, "RTCM3: type %d payload length %d\n",
+		rtcm->type, rtcm->length);
 
     switch (rtcm->type) {
     case 1001:			/* GPS Basic RTK, L1 Only */
diff --git a/driver_sirf.c b/driver_sirf.c
index ff447b1e..1830ebdd 100644
--- a/driver_sirf.c
+++ b/driver_sirf.c
@@ -1053,18 +1053,15 @@ gps_mask_t sirf_parse(struct gps_device_t * session, unsigned char *buf,
 	return 0;
 
     case 0x0e:			/* Almanac Data MID 14 */
-	gpsd_report(LOG_PROG, "SiRF: unused ALM  0x0e: %s\n",
-		    gpsd_hexdump_wrapper(buf, len, LOG_PROG));
+	gpsd_report(LOG_PROG, "SiRF: unused ALM  0x0e\n");
 	return 0;
 
     case 0x0f:			/* Ephemeris Data MID 15 */
-	gpsd_report(LOG_PROG, "SiRF: unused EPH  0x0f: %s\n",
-		    gpsd_hexdump_wrapper(buf, len, LOG_PROG));
+	gpsd_report(LOG_PROG, "SiRF: unused EPH  0x0f\n");
 	return 0;
 
     case 0x11:			/* Differential Corrections MID 17 */
-	gpsd_report(LOG_PROG, "SiRF: unused DIFF 0x11: %s\n",
-		    gpsd_hexdump_wrapper(buf, len, LOG_PROG));
+	gpsd_report(LOG_PROG, "SiRF: unused DIFF 0x11\n");
 	return 0;
 
     case 0x12:			/* OK To Send MID 18 */
@@ -1076,38 +1073,31 @@ gps_mask_t sirf_parse(struct gps_device_t * session, unsigned char *buf,
 	return sirf_msg_sysparam(session, buf, len);
 
     case 0x1b:			/* DGPS status (undocumented) MID 27 */
-	gpsd_report(LOG_PROG, "SiRF: unused DGPSF 0x1b %s\n",
-		    gpsd_hexdump_wrapper(buf, len, LOG_PROG));
+	gpsd_report(LOG_PROG, "SiRF: unused DGPSF 0x1b\n");
 	return 0;
 
     case 0x1c:			/* Navigation Library Measurement Data MID 28 */
-	gpsd_report(LOG_PROG, "SiRF: NLMD 0x1c: %s\n",
-		    gpsd_hexdump_wrapper(buf, len, LOG_PROG));
+	gpsd_report(LOG_PROG, "SiRF: NLMD 0x1c\n");
 	return sirf_msg_nlmd(session, buf, len);
 
     case 0x1d:			/* Navigation Library DGPS Data MID 29 */
-	gpsd_report(LOG_PROG, "SiRF: unused NLDG 0x1d: %s\n",
-		    gpsd_hexdump_wrapper(buf, len, LOG_PROG));
+	gpsd_report(LOG_PROG, "SiRF: unused NLDG 0x1d\n");
 	return 0;
 
     case 0x1e:			/* Navigation Library SV State Data MID 30 */
-	gpsd_report(LOG_PROG, "SiRF: unused NLSV 0x1e: %s\n",
-		    gpsd_hexdump_wrapper(buf, len, LOG_PROG));
+	gpsd_report(LOG_PROG, "SiRF: unused NLSV 0x1e\n");
 	return 0;
 
     case 0x1f:			/* Navigation Library Initialization Data MID 31 */
-	gpsd_report(LOG_PROG, "SiRF: unused NLID 0x1f: %s\n",
-		    gpsd_hexdump_wrapper(buf, len, LOG_PROG));
+	gpsd_report(LOG_PROG, "SiRF: unused NLID 0x1f\n");
 	return 0;
 
     case 0x29:			/* Geodetic Navigation Information MID 41 */
-	gpsd_report(LOG_PROG, "SiRF: unused GND 0x29: %s\n",
-		    gpsd_hexdump_wrapper(buf, len, LOG_PROG));
+	gpsd_report(LOG_PROG, "SiRF: unused GND 0x29\n");
 	return 0;
 
     case 0x32:			/* SBAS corrections MID 50 */
-	gpsd_report(LOG_PROG, "SiRF: unused SBAS 0x32: %s\n",
-		    gpsd_hexdump_wrapper(buf, len, LOG_PROG));
+	gpsd_report(LOG_PROG, "SiRF: unused SBAS 0x32\n");
 	return 0;
 
     case 0x34:			/* PPS Time MID 52 */
@@ -1135,13 +1125,11 @@ gps_mask_t sirf_parse(struct gps_device_t * session, unsigned char *buf,
 	return sirf_msg_ppstime(session, buf, len);
 
     case 0x62:			/* uBlox Extended Measured Navigation Data MID 98 */
-	gpsd_report(LOG_PROG, "SiRF: uBlox EMND 0x62: %s.\n",
-		    gpsd_hexdump_wrapper(buf, len, LOG_PROG));
+	gpsd_report(LOG_PROG, "SiRF: uBlox EMND 0x62\n");
 	return sirf_msg_ublox(session, buf, len) | (CLEAR_IS | REPORT_IS);
 
     case 0x80:			/* Initialize Data Source MID 128 */
-	gpsd_report(LOG_PROG, "SiRF: unused INIT 0x80: %s\n",
-		    gpsd_hexdump_wrapper(buf, len, LOG_PROG));
+	gpsd_report(LOG_PROG, "SiRF: unused INIT 0x80\n");
 	return 0;
 
     case 0xe1:			/* Development statistics messages MID 225 */
@@ -1151,8 +1139,8 @@ gps_mask_t sirf_parse(struct gps_device_t * session, unsigned char *buf,
 	return 0;
 
     default:
-	gpsd_report(LOG_WARN, "SiRF: Unknown packet id %d length %zd: %s\n",
-		    buf[0], len, gpsd_hexdump_wrapper(buf, len, LOG_WARN));
+	gpsd_report(LOG_WARN, "SiRF: Unknown packet id %d length %zd\n", 
+		    buf[0], len);
 	return 0;
     }
 }
diff --git a/driver_superstar2.c b/driver_superstar2.c
index c3704f07..d7fa099b 100644
--- a/driver_superstar2.c
+++ b/driver_superstar2.c
@@ -370,9 +370,8 @@ superstar2_write(struct gps_device_t *session, char *msg, size_t msglen)
     c += 0x100;
     msg[(int)msg[3] + 4] = (char)((c >> 8) & 0xff);
     msg[(int)msg[3] + 5] = (char)(c & 0xff);
-    gpsd_report(LOG_IO, "writing superstar2 control type %d len %zu:%s\n",
-		(int)msg[1] & 0x7f, msglen,
-		gpsd_hexdump_wrapper(msg, msglen, LOG_IO));
+    gpsd_report(LOG_IO, "writing superstar2 control type %d len %zu\n",
+		(int)msg[1] & 0x7f, msglen);
     return gpsd_write(session, msg, msglen);
 }
 
@@ -415,8 +414,8 @@ superstar2_dispatch(struct gps_device_t * session, unsigned char *buf,
 
     default:
 	gpsd_report(LOG_WARN,
-		    "unknown superstar2 packet id 0x%02x length %zd: %s\n",
-		    type, len, gpsd_hexdump_wrapper(buf, len, LOG_WARN));
+		    "unknown superstar2 packet id 0x%02x length %zd\n",
+		    type, len);
 	return 0;
     }
 }
diff --git a/driver_tsip.c b/driver_tsip.c
index b83b4b5d..c88699f7 100644
--- a/driver_tsip.c
+++ b/driver_tsip.c
@@ -36,9 +36,6 @@ static int tsip_write(struct gps_device_t *session,
 {
     char *ep, *cp;
 
-    gpsd_report(LOG_IO, "Sent TSIP packet id 0x%02x: %s\n", id,
-		gpsd_hexdump_wrapper(buf, len, LOG_IO));
-
     /*@ +charint @*/
     session->msgbuf[0] = '\x10';
     session->msgbuf[1] = (char)id;
@@ -54,6 +51,7 @@ static int tsip_write(struct gps_device_t *session,
     *ep++ = '\x03';
     session->msgbuflen = (size_t) (ep - session->msgbuf);
     /*@ -charint @*/
+    gpsd_report(LOG_IO, "Sent TSIP packet id 0x%02x\n", id);
     if (gpsd_write(session, session->msgbuf, session->msgbuflen) !=
 	(ssize_t) session->msgbuflen)
 	return -1;
diff --git a/driver_ubx.c b/driver_ubx.c
index 573c8078..2a1a2e35 100644
--- a/driver_ubx.c
+++ b/driver_ubx.c
@@ -479,8 +479,8 @@ gps_mask_t ubx_parse(struct gps_device_t * session, unsigned char *buf,
 
     default:
 	gpsd_report(LOG_WARN,
-		    "UBX: unknown packet id 0x%04hx (length %zd) %s\n",
-		    msgid, len, gpsd_hexdump_wrapper(buf, len, LOG_WARN));
+		    "UBX: unknown packet id 0x%04hx (length %zd)\n",
+		    msgid, len);
     }
 
     if (mask)
diff --git a/packet.c b/packet.c
index 43bd29e2..edc49c6f 100644
--- a/packet.c
+++ b/packet.c
@@ -838,9 +838,6 @@ static void nextstate(struct gps_packet_t *lexer, unsigned char c)
 	    gpsd_report(LOG_IO,
 			"Navcom packet type 0x%hhx bad checksum 0x%hhx, expecting 0x%hx\n",
 			lexer->inbuffer[3], csum, c);
-	    gpsd_report(LOG_RAW, "Navcom packet dump: %s\n",
-			gpsd_hexdump_wrapper(lexer->inbuffer, lexer->inbuflen,
-					     LOG_RAW));
 	    lexer->state = GROUND_STATE;
 	    break;
 	}