diff options
| -rw-r--r-- | driver_rtcm2.c | 4 | ||||
| -rw-r--r-- | gpsmon.c | 26 | ||||
| -rw-r--r-- | net_ntrip.c | 2 |
3 files changed, 20 insertions, 12 deletions
diff --git a/driver_rtcm2.c b/driver_rtcm2.c index c0978925..c680cf43 100644 --- a/driver_rtcm2.c +++ b/driver_rtcm2.c @@ -188,9 +188,9 @@ void rtcm2_unpack( /*@out@*/ struct rtcm2_t *tp, char *buf) csp->ident = m->sat_id; csp->iodl = m->issue_of_data_link != 0; csp->health = m->data_health; - /*@+ignoresigns@*/ + /*@+ignoresigns@*/ csp->snr = (int)(m->cn0 ? (m->cn0 + CNR_OFFSET) : SNR_BAD); - /*@-ignoresigns@*/ + /*@-ignoresigns@*/ csp->health_en = m->health_enable != 0; csp->new_data = m->new_nav_data != 0; csp->los_warning = m->loss_warn != 0; @@ -592,12 +592,14 @@ int main(int argc, char **argv) FD_ZERO(&select_set); + if ((bailout = setjmp(terminate)) == 0) { /*@ -observertrans @*/ for (;;) { + /* *INDENT-OFF* */ type_name = - session.device_type ? session.device_type-> - type_name : "Unknown device"; + session.device_type ? session.device_type->type_name : "Unknown device"; + /* *INDENT-ON* */ (void)wattrset(statwin, A_BOLD); if (serial) display(statwin, 0, 0, "%s %4d %c %d", @@ -728,9 +730,10 @@ int main(int argc, char **argv) context.readonly = !context.readonly; else context.readonly = (atoi(line + 1) == 0); + /* *INDENT-OFF* */ (void)gpsd_switch_driver(&session, - (*active)->driver-> - type_name); + (*active)->driver->type_name); + /* *INDENT-ON* */ } break; @@ -751,10 +754,12 @@ int main(int argc, char **argv) #ifdef ALLOW_RECONFIGURE case 'n': /* change mode */ /* if argument not specified, toggle */ - if (strcspn(line, "01") == strlen(line)) - v = (unsigned int)TEXTUAL_PACKET_TYPE(session.packet. - type); - else + if (strcspn(line, "01") == strlen(line)) { + /* *INDENT-OFF* */ + v = (unsigned int)TEXTUAL_PACKET_TYPE( + session.packet.type); + /* *INDENT-ON* */ + } else v = (unsigned)atoi(line + 1); if (active == NULL) monitor_complain("No device defined yet"); @@ -888,10 +893,11 @@ int main(int argc, char **argv) arg); } else if (matchcount == 1) { assert(forcetype != NULL); + /* *INDENT-OFF* */ if (switch_type(forcetype)) (void)gpsd_switch_driver(&session, - forcetype-> - type_name); + forcetype->type_name); + /* *INDENT-ON* */ } else { monitor_complain ("Multiple driver type names match '%s'.", diff --git a/net_ntrip.c b/net_ntrip.c index 8dfff51f..100fe012 100644 --- a/net_ntrip.c +++ b/net_ntrip.c @@ -359,6 +359,7 @@ static int ntrip_auth_encode(const struct ntrip_stream_t *stream, return 0; } +/* *INDENT-OFF* */ /*@ -nullpass @*//* work around a splint bug */ static int ntrip_stream_open(const char *caster, const char *port, /*@null@*/ const char *auth, @@ -429,6 +430,7 @@ static int ntrip_stream_open(const char *caster, const char *port, (void)close(context->dsock); return -1; } +/* *INDENT-ON* */ /*@ +nullpass @*/ |