From a425161cab6a09d9850305f6fecd520f0d260b2b Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Wed, 16 Feb 2011 08:31:20 -0500 Subject: Splint cleanup. All regression tests pass. --- cgps.c | 2 +- gps_json.h | 2 +- gpsd.c | 2 +- gpsd.h-tail | 2 +- gpsd_json.c | 10 ++++++---- gpxlogger.c | 2 +- pseudonmea.c | 26 +++++++++++++------------- 7 files changed, 24 insertions(+), 22 deletions(-) diff --git a/cgps.c b/cgps.c index ddf1ece8..62d99c44 100644 --- a/cgps.c +++ b/cgps.c @@ -736,6 +736,7 @@ int main(int argc, char *argv[]) struct timeval timeout; fd_set rfds; int data; + unsigned int flags = WATCH_ENABLE; /*@ -observertrans @*/ switch (gpsd_units()) { @@ -854,7 +855,6 @@ int main(int argc, char *argv[]) status_timer = time(NULL); - unsigned int flags = WATCH_ENABLE; if (source.device != NULL) flags |= WATCH_DEVICE; (void)gps_stream(&gpsdata, flags, source.device); diff --git a/gps_json.h b/gps_json.h index fc6b5aef..0f141650 100644 --- a/gps_json.h +++ b/gps_json.h @@ -26,7 +26,7 @@ int json_watch_read(const char *, /*@out@*/struct policy_t *, int json_device_read(const char *, /*@out@*/struct devconfig_t *, /*@null@*/const char **); void json_version_dump(/*@out@*/char *, size_t); -void json_aivdm_dump(const struct ais_t *, const char *, bool, +void json_aivdm_dump(const struct ais_t *, /*@null@*/const char *, bool, /*@out@*/char *, size_t); int json_rtcm2_read(const char *, char *, size_t, struct rtcm2_t *, /*@null@*/const char **); diff --git a/gpsd.c b/gpsd.c index 108c29bb..6994160e 100644 --- a/gpsd.c +++ b/gpsd.c @@ -1499,7 +1499,7 @@ static void consume_packets(struct gps_device_t *device) memcpy(context.rtcmbuf, device->packet.outbuffer, context.rtcmbytes); - context.rtcmtime = time(NULL); + context.rtcmtime = (double)time(NULL); } } diff --git a/gpsd.h-tail b/gpsd.h-tail index 11ae76c6..a443a0b7 100644 --- a/gpsd.h-tail +++ b/gpsd.h-tail @@ -154,7 +154,7 @@ extern void isgps_output_magnavox(const isgps30bits_t *, unsigned int, FILE *); extern enum isgpsstat_t rtcm2_decode(struct gps_packet_t *, unsigned int); extern void rtcm2_sager_dump(const struct rtcm2_t *, /*@out@*/char[], size_t); extern void json_rtcm2_dump(const struct rtcm2_t *, - const char *, /*@out@*/char[], size_t); + /*@null@*/const char *, /*@out@*/char[], size_t); extern int rtcm2_undump(/*@out@*/struct rtcm2_t *, char *); extern void rtcm2_unpack(/*@out@*/struct rtcm2_t *, char *); extern void rtcm3_unpack(/*@out@*/struct rtcm3_t *, char *); diff --git a/gpsd_json.c b/gpsd_json.c index fd8dbeb5..6688bc13 100644 --- a/gpsd_json.c +++ b/gpsd_json.c @@ -708,8 +708,9 @@ void json_subframe_dump(const struct gps_data_t *datap, } #if defined(RTCM104V2_ENABLE) -void json_rtcm2_dump(const struct rtcm2_t *rtcm, const char *device, - /*@out@*/ char buf[], size_t buflen) +void json_rtcm2_dump(const struct rtcm2_t *rtcm, + /*@null@*/const char *device, + /*@out@*/char buf[], size_t buflen) /* dump the contents of a parsed RTCM104 message as JSON */ { /*@-mustfreefresh@*/ @@ -835,8 +836,9 @@ void json_rtcm2_dump(const struct rtcm2_t *rtcm, const char *device, #if defined(AIVDM_ENABLE) -void json_aivdm_dump(const struct ais_t *ais, const char *device, bool scaled, - /*@out@*/ char *buf, size_t buflen) +void json_aivdm_dump(const struct ais_t *ais, + /*@null@*/const char *device, bool scaled, + /*@out@*/char *buf, size_t buflen) { char buf1[JSON_VAL_MAX * 2 + 1]; char buf2[JSON_VAL_MAX * 2 + 1]; diff --git a/gpxlogger.c b/gpxlogger.c index c3285a09..ffe8899d 100644 --- a/gpxlogger.c +++ b/gpxlogger.c @@ -300,6 +300,7 @@ static struct fixsource_t source; static int socket_mainloop(void) { fd_set fds; + unsigned int flags = WATCH_ENABLE; if (gps_open(source.server, source.port, &gpsdata) != 0) { (void)fprintf(stderr, @@ -308,7 +309,6 @@ static int socket_mainloop(void) exit(1); } - unsigned int flags = WATCH_ENABLE; if (source.device != NULL) flags |= WATCH_DEVICE; (void)gps_stream(&gpsdata, flags, source.device); diff --git a/pseudonmea.c b/pseudonmea.c index 732d3286..31b094e9 100644 --- a/pseudonmea.c +++ b/pseudonmea.c @@ -258,19 +258,19 @@ static void gpsd_binary_almanac_dump(struct gps_device_t *session, if ( session->gpsdata.subframe.is_almanac ) { (void)snprintf(bufp, len, "$GPALM,1,1,%02d,%04d,%02x,%04x,%02x,%04x,%04x,%05x,%06x,%06x,%06x,%03x,%03x", - session->gpsdata.subframe.sub5.almanac.sv, - session->context->gps_week % 1024, - session->gpsdata.subframe.sub5.almanac.svh, - session->gpsdata.subframe.sub5.almanac.e, - session->gpsdata.subframe.sub5.almanac.toa, - session->gpsdata.subframe.sub5.almanac.deltai, - session->gpsdata.subframe.sub5.almanac.Omegad, - session->gpsdata.subframe.sub5.almanac.sqrtA, - session->gpsdata.subframe.sub5.almanac.omega, - session->gpsdata.subframe.sub5.almanac.Omega0, - session->gpsdata.subframe.sub5.almanac.M0, - session->gpsdata.subframe.sub5.almanac.af0, - session->gpsdata.subframe.sub5.almanac.af1); + (int)session->gpsdata.subframe.sub5.almanac.sv, + (int)session->context->gps_week % 1024, + (unsigned int)session->gpsdata.subframe.sub5.almanac.svh, + (unsigned int)session->gpsdata.subframe.sub5.almanac.e, + (unsigned int)session->gpsdata.subframe.sub5.almanac.toa, + (unsigned int)session->gpsdata.subframe.sub5.almanac.deltai, + (unsigned int)session->gpsdata.subframe.sub5.almanac.Omegad, + (unsigned int)session->gpsdata.subframe.sub5.almanac.sqrtA, + (unsigned int)session->gpsdata.subframe.sub5.almanac.omega, + (unsigned int)session->gpsdata.subframe.sub5.almanac.Omega0, + (unsigned int)session->gpsdata.subframe.sub5.almanac.M0, + (unsigned int)session->gpsdata.subframe.sub5.almanac.af0, + (unsigned int)session->gpsdata.subframe.sub5.almanac.af1); nmea_add_checksum(bufp); } } -- cgit v1.2.1