From ac3d44a1912795d06bcc2501741c9c3deaba8a0d Mon Sep 17 00:00:00 2001 From: "Gary E. Miller" Date: Wed, 25 Mar 2015 15:29:56 -0700 Subject: Fix more splint: Line expects to suppress X errors, found 0 errors --- driver_evermore.c | 6 +++--- driver_navcom.c | 2 +- driver_nmea2000.c | 22 ++++++++++------------ driver_superstar2.c | 4 ++-- driver_tsip.c | 2 +- drivers.c | 2 +- 6 files changed, 18 insertions(+), 20 deletions(-) diff --git a/driver_evermore.c b/driver_evermore.c index f7328182..c8bc090d 100644 --- a/driver_evermore.c +++ b/driver_evermore.c @@ -462,7 +462,7 @@ static bool evermore_protocol(struct gps_device_t *session, int protocol) /*@ -charint */ gpsd_log(&session->context->errout, LOG_PROG, "evermore_protocol(%d)\n", protocol); - /*@i1@*/ tmp8 = (protocol != 0) ? 1 : 0; + tmp8 = (protocol != 0) ? 1 : 0; /* NMEA : binary */ evrm_protocol_config[1] = tmp8; return (evermore_control_send @@ -493,10 +493,10 @@ static bool evermore_nmea_config(struct gps_device_t *session, int mode) /*@ -charint */ gpsd_log(&session->context->errout, LOG_PROG, "evermore_nmea_config(%d)\n", mode); - /*@i1@*/ tmp8 = (mode == 1) ? 5 : 1; + tmp8 = (mode == 1) ? 5 : 1; /* NMEA GPGSV, gpsd */ evrm_nmeaout_config[6] = tmp8; /* GPGSV, 1s or 5s */ - /*@i1@*/ tmp8 = (mode == 2) ? 1 : 0; + tmp8 = (mode == 2) ? 1 : 0; /* NMEA PEMT101 */ evrm_nmeaout_config[9] = tmp8; /* PEMT101, 1s or 0s */ return (evermore_control_send(session, (char *)evrm_nmeaout_config, diff --git a/driver_navcom.c b/driver_navcom.c index 18f56f3c..661cc854 100644 --- a/driver_navcom.c +++ b/driver_navcom.c @@ -1268,7 +1268,7 @@ static bool navcom_speed(struct gps_device_t *session, /* Proceed to construct our message */ port = session->driver.navcom.physical_port; - /*@i1@*/ port_selection = (port ? port : (uint8_t) 0xff) | baud; + port_selection = (port ? port : (uint8_t) 0xff) | baud; /* Send it off */ navcom_cmd_0x11(session, port_selection); diff --git a/driver_nmea2000.c b/driver_nmea2000.c index 2fb55341..0975e4c0 100644 --- a/driver_nmea2000.c +++ b/driver_nmea2000.c @@ -67,7 +67,7 @@ static int scale_int(int32_t var, const int64_t factor) ret = var; ret *= factor; - /*@i1@*/ret >>= 32; + ret >>= 32; return((int)ret); } @@ -1395,16 +1395,15 @@ static void find_pgn(struct can_frame *frame, struct gps_device_t *session) gpsd_log(&session->context->errout, LOG_DATA, "pgn %6d:%s \n", work->pgn, work->name); session->driver.nmea2000.workpgn = (void *) work; - /*@i1@*/session->lexer.outbuflen = frame->can_dlc & 0x0f; + session->lexer.outbuflen = frame->can_dlc & 0x0f; for (l2=0;l2lexer.outbuflen;l2++) { - /*@i3@*/session->lexer.outbuffer[l2]= frame->data[l2]; + session->lexer.outbuffer[l2]= frame->data[l2]; } - } - /*@i2@*/else if ((frame->data[0] & 0x1f) == 0) { + } else if ((frame->data[0] & 0x1f) == 0) { unsigned int l2; - /*@i2@*/session->driver.nmea2000.fast_packet_len = frame->data[1]; - /*@i2@*/session->driver.nmea2000.idx = frame->data[0]; + session->driver.nmea2000.fast_packet_len = frame->data[1]; + session->driver.nmea2000.idx = frame->data[0]; #if NMEA2000_FAST_DEBUG gpsd_log(&session->context->errout, LOG_ERROR, "Set idx %2x %2x %2x %6d\n", @@ -1416,17 +1415,16 @@ static void find_pgn(struct can_frame *frame, struct gps_device_t *session) session->lexer.inbuflen = 0; session->driver.nmea2000.idx += 1; for (l2=2;l2<8;l2++) { - /*@i3@*/session->lexer.inbuffer[session->lexer.inbuflen++] = frame->data[l2]; + session->lexer.inbuffer[session->lexer.inbuflen++] = frame->data[l2]; } gpsd_log(&session->context->errout, LOG_DATA, "pgn %6d:%s \n", work->pgn, work->name); - } - /*@i2@*/else if (frame->data[0] == session->driver.nmea2000.idx) { + } else if (frame->data[0] == session->driver.nmea2000.idx) { unsigned int l2; for (l2=1;l2<8;l2++) { if (session->driver.nmea2000.fast_packet_len > session->lexer.inbuflen) { - /*@i3@*/session->lexer.inbuffer[session->lexer.inbuflen++] = frame->data[l2]; + session->lexer.inbuffer[session->lexer.inbuflen++] = frame->data[l2]; } } if (session->lexer.inbuflen == session->driver.nmea2000.fast_packet_len) { @@ -1452,7 +1450,7 @@ static void find_pgn(struct can_frame *frame, struct gps_device_t *session) gpsd_log(&session->context->errout, LOG_ERROR, "Fast error %2x %2x %2x %2x %6d\n", session->driver.nmea2000.idx, - /*@i2@*/frame->data[0], + frame->data[0], session->driver.nmea2000.unit, (unsigned int) session->driver.nmea2000.fast_packet_len, source_pgn); diff --git a/driver_superstar2.c b/driver_superstar2.c index e46d2df5..e57463b1 100644 --- a/driver_superstar2.c +++ b/driver_superstar2.c @@ -115,8 +115,8 @@ superstar2_msg_navsol_lla(struct gps_device_t *session, mask |= LATLON_SET | ALTITUDE_SET | SPEED_SET | TRACK_SET | CLIMB_SET; session->gpsdata.satellites_used = (int)getub(buf, 71) & 0x0f; - /*@i3@*/ session->gpsdata.dop.hdop = getleu16(buf, 66) * 0.1; - /*@i3@*/ session->gpsdata.dop.vdop = getleu16(buf, 68) * 0.1; + session->gpsdata.dop.hdop = getleu16(buf, 66) * 0.1; + session->gpsdata.dop.vdop = getleu16(buf, 68) * 0.1; /* other DOP if available */ mask |= DOP_SET | USED_IS; diff --git a/driver_tsip.c b/driver_tsip.c index 6e503841..97cb4514 100644 --- a/driver_tsip.c +++ b/driver_tsip.c @@ -716,7 +716,7 @@ static gps_mask_t tsip_parse_input(struct gps_device_t *session) if ((session->newdata.track = atan2(d1, d2) * RAD_2_DEG) < 0) session->newdata.track += 360.0; session->newdata.latitude = (double)sl1 * SEMI_2_DEG; - /*@i1@*/session->newdata.longitude = ul2 * SEMI_2_DEG; + session->newdata.longitude = ul2 * SEMI_2_DEG; if (session->newdata.longitude > 180.0) session->newdata.longitude -= 360.0; session->gpsdata.separation = diff --git a/drivers.c b/drivers.c index 03dd3ffa..69959a6e 100644 --- a/drivers.c +++ b/drivers.c @@ -1115,7 +1115,7 @@ static bool mtk3301_rate_switcher(struct gps_device_t *session, double rate) { char buf[78]; - /*@i1@*/ unsigned int milliseconds = 1000 * rate; + unsigned int milliseconds = 1000 * rate; if (rate > 1) milliseconds = 1000; else if (rate < 0.2) -- cgit v1.2.1