diff options
| -rw-r--r-- | driver_ais.c | 3 | ||||
| -rw-r--r-- | driver_nmea0183.c | 2 | ||||
| -rw-r--r-- | driver_rtcm2.c | 2 | ||||
| -rw-r--r-- | drivers.c | 4 | ||||
| -rw-r--r-- | gpsctl.c | 2 | ||||
| -rw-r--r-- | gpsmon.c | 20 | ||||
| -rw-r--r-- | monitor_nmea.c | 4 |
7 files changed, 20 insertions, 17 deletions
diff --git a/driver_ais.c b/driver_ais.c index e2a17f8d..cc22d982 100644 --- a/driver_ais.c +++ b/driver_ais.c @@ -69,6 +69,9 @@ bool ais_binary_decode(const int debug, unsigned int u; int i; +#ifdef S_SPLINT_S + assert(type24_queue != NULL); +#endif /* S_SPLINT_S */ #define BITS_PER_BYTE 8 #define UBITS(s, l) ubits((unsigned char *)bits, s, l, false) #define SBITS(s, l) sbits((signed char *)bits, s, l, false) diff --git a/driver_nmea0183.c b/driver_nmea0183.c index 5fc017f3..ff0b6ae7 100644 --- a/driver_nmea0183.c +++ b/driver_nmea0183.c @@ -1147,7 +1147,7 @@ static gps_mask_t processMTK3301(int c UNUSED, char *field[], * milliseconds" */ if (atoi(field[5]) < 127875) - nmea_send(session, "$PMTK324,0,0,1,0,127875"); + (void)nmea_send(session, "$PMTK324,0,0,1,0,127875"); return ONLINE_SET; case 705: /* return device subtype */ (void)strlcat(session->subtype, field[1], sizeof(session->subtype)); diff --git a/driver_rtcm2.c b/driver_rtcm2.c index f86ef64b..cb0c2663 100644 --- a/driver_rtcm2.c +++ b/driver_rtcm2.c @@ -733,6 +733,7 @@ static unsigned int tx_speed[] = { 25, 50, 100, 110, 150, 200, 250, 300 }; #define DIMENSION(a) (unsigned)(sizeof(a)/sizeof(a[0])) +/*@-type */ void rtcm2_unpack( /*@out@*/ struct rtcm2_t *tp, char *buf) /* break out the raw bits into the content fields */ { @@ -979,6 +980,7 @@ static bool length_check(struct gps_packet_t *lexer) && lexer->isgps.bufindex >= ((struct rtcm2_msg_t *)lexer->isgps.buf)->w2.frmlen + 2u; } +/*@+type */ enum isgpsstat_t rtcm2_decode(struct gps_packet_t *lexer, unsigned int c) { @@ -245,7 +245,7 @@ static void nmea_event_hook(struct gps_device_t *session, event_t event) } /* *INDENT-OFF* */ -const struct gps_type_t nmea = { +const struct gps_type_t nmea0183 = { .type_name = "Generic NMEA", /* full name of type */ .packet_type = NMEA_PACKET, /* associated lexer packet type */ .flags = DRIVER_NOFLAGS, /* remember this */ @@ -1496,7 +1496,7 @@ extern const struct gps_type_t navcom_binary, superstar2_binary; static const struct gps_type_t *gpsd_driver_array[] = { &unknown, #ifdef NMEA_ENABLE - &nmea, + &nmea0183, #ifdef ASHTECH_ENABLE &ashtech, #endif /* ASHTECHV18_ENABLE */ @@ -623,8 +623,6 @@ int main(int argc, char **argv) * hunt rather than timing out. Otherwise we can easily get messages * that spuriously look like failure at high baud rates. */ - if (timeout == DEFAULT_TIMEOUT) - timeout = 0; /*@ -mustfreeonly -immediatetrans @*/ gps_context_init(&context); @@ -40,7 +40,7 @@ extern struct monitor_object_t garmin_mmt, garmin_bin_ser_mmt; extern struct monitor_object_t italk_mmt, ubx_mmt, superstar2_mmt; extern struct monitor_object_t fv18_mmt, gpsclock_mmt, mtk3301_mmt; extern struct monitor_object_t oncore_mmt, tnt_mmt, aivdm_mmt; -extern const struct gps_type_t nmea; +extern const struct gps_type_t nmea0183; /* These are public */ struct gps_device_t session; @@ -371,14 +371,14 @@ void monitor_complain(const char *fmt, ...) va_end(ap); (void)wattrset(cmdwin, A_NORMAL); (void)wrefresh(cmdwin); - doupdate(); + (void)doupdate(); (void)wgetch(cmdwin); (void)wmove(cmdwin, 0, (int)promptlen); (void)wclrtoeol(cmdwin); (void)wrefresh(cmdwin); (void)wmove(cmdwin, 0, (int)promptlen); - doupdate(); + (void)doupdate(); } void monitor_log(const char *fmt, ...) @@ -508,7 +508,7 @@ static void gpsmon_hook(struct gps_device_t *device, gps_mask_t changed UNUSED) const struct gps_type_t *active_type = device->device_type; if (device->packet.type == NMEA_PACKET && ((device->device_type->flags & DRIVER_STICKY) != 0)) - active_type = &nmea; + active_type = &nmea0183; if (!switch_type(active_type)) longjmp(terminate, TERM_DRIVER_SWITCH); else { @@ -562,9 +562,9 @@ static bool do_command(void) c = wgetch(cmdwin); if (c == CTRL('L')) { - (void)clearok(stdscr, TRUE); + (void)clearok(stdscr, true); if (active != NULL && (*active)->initialize != NULL) - (*active)->initialize(); + (void)(*active)->initialize(); gpsmon_hook(&session, 0); } else if (c != '\r' && c != '\n') { size_t len = strlen(input); @@ -574,9 +574,9 @@ static bool do_command(void) } else if (isprint(c)) { input[len] = (char)c; input[++len] = '\0'; - (void)waddch(cmdwin, c); + (void)waddch(cmdwin, (chtype)c); (void)wrefresh(cmdwin); - doupdate(); + (void)doupdate(); } return true; @@ -585,7 +585,7 @@ static bool do_command(void) (void)wmove(cmdwin, 0, (int)promptlen); (void)wclrtoeol(cmdwin); (void)wrefresh(cmdwin); - doupdate(); + (void)doupdate(); /* user finished entering a command */ if (input[0] == '\0') @@ -1090,7 +1090,7 @@ int main(int argc, char **argv) (void)cbreak(); (void)intrflush(stdscr, FALSE); (void)keypad(stdscr, true); - (void)clearok(stdscr, TRUE); + (void)clearok(stdscr, true); (void)clear(); (void)noecho(); curses_active = true; diff --git a/monitor_nmea.c b/monitor_nmea.c index 81d3121e..5efa791b 100644 --- a/monitor_nmea.c +++ b/monitor_nmea.c @@ -20,7 +20,7 @@ #include "gpsdclient.h" #ifdef NMEA_ENABLE -extern const struct gps_type_t nmea; +extern const struct gps_type_t nmea0183; static WINDOW *cookedwin, *nmeawin, *satwin, *gprmcwin, *gpggawin, *gpgsawin, *gpgstwin; static timestamp_t last_tick, tick_interval; @@ -336,7 +336,7 @@ const struct monitor_object_t nmea_mmt = { .command = NULL, .wrap = nmea_wrap, .min_y = 21,.min_x = 80, - .driver = &nmea, + .driver = &nmea0183, }; /***************************************************************************** |