summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2011-03-30 07:51:28 -0400
committerEric S. Raymond <esr@thyrsus.com>2011-03-30 07:51:28 -0400
commit4918b2e5357c3b8f01a8af2a64e5af7d11befb4e (patch)
tree3bbe12c86d18e7608916ec6c83f5993fdcb34ad5
parent00d30e50601529a72d22ecc3183d18e1847f096b (diff)
downloadgpsd-4918b2e5357c3b8f01a8af2a64e5af7d11befb4e.tar.gz
Clean up more scan-build warnings, from the raw logs this time.
-rw-r--r--monitor_nmea.c20
-rw-r--r--packet.c4
2 files changed, 12 insertions, 12 deletions
diff --git a/monitor_nmea.c b/monitor_nmea.c
index dcfb6e72..05736f12 100644
--- a/monitor_nmea.c
+++ b/monitor_nmea.c
@@ -42,19 +42,19 @@ static bool nmea_initialize(void)
cookedwin = derwin(devicewin, 3, 80, 0, 0);
(void)wborder(cookedwin, 0, 0, 0, 0, 0, 0, 0, 0);
(void)syncok(cookedwin, true);
- wattrset(cookedwin, A_BOLD);
- mvwaddstr(cookedwin, 1, 1, "Time: ");
- mvwaddstr(cookedwin, 1, 31, "Lat: ");
- mvwaddstr(cookedwin, 1, 55, "Lon: ");
- mvwaddstr(cookedwin, 2, 34, " Cooked PVT ");
- wattrset(cookedwin, A_NORMAL);
+ (void)wattrset(cookedwin, A_BOLD);
+ (void)mvwaddstr(cookedwin, 1, 1, "Time: ");
+ (void)mvwaddstr(cookedwin, 1, 31, "Lat: ");
+ (void)mvwaddstr(cookedwin, 1, 55, "Lon: ");
+ (void)mvwaddstr(cookedwin, 2, 34, " Cooked PVT ");
+ (void)wattrset(cookedwin, A_NORMAL);
nmeawin = derwin(devicewin, 3, 80, 3, 0);
(void)wborder(nmeawin, 0, 0, 0, 0, 0, 0, 0, 0);
(void)syncok(nmeawin, true);
- wattrset(nmeawin, A_BOLD);
- mvwaddstr(nmeawin, 2, 34, " Sentences ");
- wattrset(nmeawin, A_NORMAL);
+ (void)wattrset(nmeawin, A_BOLD);
+ (void)mvwaddstr(nmeawin, 2, 34, " Sentences ");
+ (void)wattrset(nmeawin, A_NORMAL);
satwin = derwin(devicewin, MAXSATS + 3, 20, 6, 0);
(void)wborder(satwin, 0, 0, 0, 0, 0, 0, 0, 0), (void)syncok(satwin, true);
@@ -188,7 +188,7 @@ static void nmea_update(void)
*--s_end = '.';
*--s_end = '.';
}
- mvwaddstr(nmeawin, SENTENCELINE, 1, sentences);
+ (void)mvwaddstr(nmeawin, SENTENCELINE, 1, sentences);
}
/*
diff --git a/packet.c b/packet.c
index 5181101f..ba383284 100644
--- a/packet.c
+++ b/packet.c
@@ -830,7 +830,7 @@ static void nextstate(struct gps_packet_t *lexer, unsigned char c)
csum ^= lexer->inbuffer[n];
if (csum != c) {
gpsd_report(LOG_IO,
- "Navcom packet type 0x%hx bad checksum 0x%hx, expecting 0x%hx\n",
+ "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,
@@ -1650,7 +1650,7 @@ void packet_parse(struct gps_packet_t *lexer)
packet_accept(lexer, UBX_PACKET);
else {
gpsd_report(LOG_IO,
- "UBX checksum 0x%02hhx%02hhx over length %hd,"
+ "UBX checksum 0x%02hhx%02hhx over length %d,"
" expecting 0x%02hhx%02hhx (type 0x%02hhx%02hhx)\n",
ck_a,
ck_b,