5 files changed, 9 insertions, 9 deletions

diff --git a/bits.c b/bits.c
index 34fd4064..502e0a7d 100644
--- a/bits.c
+++ b/bits.c
@@ -27,13 +27,13 @@ uint64_t ubits(char buf[], unsigned int start, unsigned int width, bool le)
     /*@i1@*/ assert(width <= sizeof(uint64_t) * CHAR_BIT);
     for (i = start / CHAR_BIT;
 	 i < (start + width + CHAR_BIT - 1) / CHAR_BIT; i++) {
-	fld <<= CHAR_BIT;
+	/*@i1@*/fld <<= CHAR_BIT;
 	fld |= (unsigned char)buf[i];
     }
 
     end = (start + width) % CHAR_BIT;
     if (end != 0) {
-	fld >>= (CHAR_BIT - end);
+	/*@i1@*/fld >>= (CHAR_BIT - end);
     }
 
     /*@ -shiftimplementation @*/
diff --git a/gpsd.c b/gpsd.c
index 93264f0b..7f977dde 100644
--- a/gpsd.c
+++ b/gpsd.c
@@ -1339,15 +1339,15 @@ static void raw_report(struct subscriber_t *sub, struct gps_device_t *device)
      * Maybe the user wants a binary packet hexdumped.
      */
     if (sub->policy.raw == 1) {
-	char *hd =
+	const char *hd =
 	    gpsd_hexdump((char *)device->packet.outbuffer,
 			 device->packet.outbuflen);
 	/*
 	 * Ugh...depends on knowing the length of gpsd_hexdump's
 	 * buffer.
 	 */
-	(void)strlcat(hd, "\r\n", MAX_PACKET_LENGTH * 2 + 1);
-	(void)throttled_write(sub, hd, strlen(hd));
+	(void)strlcat((char *)hd, "\r\n", MAX_PACKET_LENGTH * 2 + 1);
+	(void)throttled_write(sub, (char *)hd, strlen(hd));
     }
 #endif /* BINARY_ENABLE */
 }
diff --git a/gpsd.h-tail b/gpsd.h-tail
index 0613386c..4bf1da9e 100644
--- a/gpsd.h-tail
+++ b/gpsd.h-tail
@@ -702,7 +702,7 @@ extern gps_mask_t gpsd_interpret_subframe(struct gps_device_t *, unsigned int,
 				uint32_t[]);
 extern gps_mask_t gpsd_interpret_subframe_raw(struct gps_device_t *,
 				unsigned int, uint32_t[]);
-extern /*@ observer @*/ char *gpsd_hexdump(/*@null@*/char *, size_t);
+extern /*@ observer @*/ const char *gpsd_hexdump(/*@null@*/char *, size_t);
 # ifdef __cplusplus
 extern "C" {
 # endif
@@ -716,7 +716,7 @@ extern void gpsd_position_fix_dump(struct gps_device_t *,
 extern void gpsd_clear_data(struct gps_device_t *);
 extern socket_t netlib_connectsock(int, const char *, const char *, const char *);
 extern socket_t netlib_localsocket(const char *, int);
-extern char /*@observer@*/ *netlib_errstr(const int);
+extern const char /*@observer@*/ *netlib_errstr(const int);
 extern char /*@observer@*/ *netlib_sock2ip(int);
 
 extern void nmea_tpv_dump(struct gps_device_t *, /*@out@*/char[], size_t);
diff --git a/hex.c b/hex.c
index 5b7a673f..ef67f06b 100644
--- a/hex.c
+++ b/hex.c
@@ -8,7 +8,7 @@
 
 #include "gpsd.h"
 
-char /*@ observer @*/ *gpsd_hexdump(char *binbuf, size_t binbuflen)
+const char /*@ observer @*/ *gpsd_hexdump(char *binbuf, size_t binbuflen)
 {
     char *cp;
     bool printable = true;
diff --git a/netlib.c b/netlib.c
index d83d6a63..82f0e3b2 100644
--- a/netlib.c
+++ b/netlib.c
@@ -127,7 +127,7 @@ socket_t netlib_connectsock(int af, const char *host, const char *service,
 
 /*@+mustfreefresh +usedef@*/
 
-char /*@observer@*/ *netlib_errstr(const int err)
+const char /*@observer@*/ *netlib_errstr(const int err)
 {
     switch (err) {
     case NL_NOSERVICE: