diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2006-08-20 16:57:55 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2006-08-20 16:57:55 +0000 |
| commit | 26970286199d9c1d19a214bcf8405e63798f9496 (patch) | |
| tree | 40a5b193c6f3b66f186a6b72302e873e9ccd88c2 /gpsutils.c | |
| parent | f2e82b634c39a4a3e2c45590f1dcf2de4be79a7c (diff) | |
| download | gpsd-26970286199d9c1d19a214bcf8405e63798f9496.tar.gz | |
splint cleanup after CK's strcat()/strlcopy() cleanup.
Diffstat (limited to 'gpsutils.c')
| -rw-r--r-- | gpsutils.c | 34 |
1 files changed, 18 insertions, 16 deletions
@@ -34,16 +34,16 @@ void gps_clear_fix(/*@ out @*/struct gps_fix_t *fixp) fixp->dip = NAN; } -int gps_valid_fields(/*@ in @*/struct gps_fix_t *fixp) +unsigned int gps_valid_fields(/*@ in @*/struct gps_fix_t *fixp) { - int valid = 0; + unsigned int valid = 0; if (isnan(fixp->time) != 0) valid |= TIME_SET; if (fixp->mode != MODE_NOT_SEEN) - valid != MODE_SET; + valid |= MODE_SET; if (isnan(fixp->latitude) !=0 && isnan(fixp->longitude) !=0) - valid != LATLON_SET; + valid |= LATLON_SET; if (isnan(fixp->altitude) != 0) valid |= ALTITUDE_SET; if (isnan(fixp->track) != 0) @@ -69,35 +69,37 @@ int gps_valid_fields(/*@ in @*/struct gps_fix_t *fixp) char *gps_show_transfer(int transfer) { +/*@ -statictrans @*/ static char showbuf[100]; showbuf[0] = '\0'; if ((transfer & TIME_SET)!=0) - strlcat(showbuf, "time,", sizeof(showbuf)); + (void)strlcat(showbuf, "time,", sizeof(showbuf)); if ((transfer & LATLON_SET)!=0) - strlcat(showbuf, "latlon,", sizeof(showbuf)); + (void)strlcat(showbuf, "latlon,", sizeof(showbuf)); if ((transfer & MODE_SET)!=0) - strlcat(showbuf, "mode,", sizeof(showbuf)); + (void)strlcat(showbuf, "mode,", sizeof(showbuf)); if ((transfer & ALTITUDE_SET)!=0) - strlcat(showbuf, "altitude,", sizeof(showbuf)); + (void)strlcat(showbuf, "altitude,", sizeof(showbuf)); if ((transfer & TRACK_SET)!=0) - strlcat(showbuf, "track,", sizeof(showbuf)); + (void)strlcat(showbuf, "track,", sizeof(showbuf)); if ((transfer & SPEED_SET)!=0) - strlcat(showbuf, "speed,", sizeof(showbuf)); + (void)strlcat(showbuf, "speed,", sizeof(showbuf)); if ((transfer & CLIMB_SET)!=0) - strlcat(showbuf, "climb,", sizeof(showbuf)); + (void)strlcat(showbuf, "climb,", sizeof(showbuf)); if ((transfer & TIMERR_SET)!=0) - strlcat(showbuf, "timerr,", sizeof(showbuf)); + (void)strlcat(showbuf, "timerr,", sizeof(showbuf)); if ((transfer & HERR_SET)!=0) - strlcat(showbuf, "herr,", sizeof(showbuf)); + (void)strlcat(showbuf, "herr,", sizeof(showbuf)); if ((transfer & VERR_SET)!=0) - strlcat(showbuf, "verr,", sizeof(showbuf)); + (void)strlcat(showbuf, "verr,", sizeof(showbuf)); if ((transfer & SPEEDERR_SET)!=0) - strlcat(showbuf, "speederr,", sizeof(showbuf)); + (void)strlcat(showbuf, "speederr,", sizeof(showbuf)); if ((transfer & CLIMBERR_SET)!=0) - strlcat(showbuf, "climberr,", sizeof(showbuf)); + (void)strlcat(showbuf, "climberr,", sizeof(showbuf)); if (strlen(showbuf)>0) showbuf[strlen(showbuf)-1] = '\0'; return showbuf; +/*@ +statictrans @*/ } void gps_merge_fix(/*@ out @*/struct gps_fix_t *to, |