diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2010-09-16 04:10:59 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2010-09-16 04:10:59 -0400 |
| commit | 5d9055b96090305a877e892cafb56f497374d519 (patch) | |
| tree | 0e012ec033c59520f853f58da9bf1563b7d956aa /driver_aivdm.c | |
| parent | 736c962e780113fffca025079482f711fb445aad (diff) | |
| download | gpsd-5d9055b96090305a877e892cafb56f497374d519.tar.gz | |
Enable much stricter compilation warnings
We now compile with -Wextra on and only the warning on missing fields in
initializers turned off (because of the way some of thee JSON code is
generated). Cleanups necessary to eliminate all warnings have been done.
All regression tests pass.
Diffstat (limited to 'driver_aivdm.c')
| -rw-r--r-- | driver_aivdm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/driver_aivdm.c b/driver_aivdm.c index af0c890a..dd7bb761 100644 --- a/driver_aivdm.c +++ b/driver_aivdm.c @@ -341,18 +341,18 @@ bool aivdm_decode(const char *buf, size_t buflen, case 7: /* Binary acknowledge */ case 13: /* Safety Related Acknowledge */ { - unsigned int mmsi[4]; + unsigned int u, mmsi[4]; if (ais_context->bitlen < 72 || ais_context->bitlen > 168) { gpsd_report(LOG_WARN, "AIVDM message type %d size is out of range (%zd).\n", ais->type, ais_context->bitlen); return false; } - for (i = 0; i < sizeof(mmsi)/sizeof(mmsi[0]); i++) - if (ais_context->bitlen > 40 + 32*i) - mmsi[i] = UBITS(40 + 32*i, 30); + for (u = 0; u < sizeof(mmsi)/sizeof(mmsi[0]); u++) + if (ais_context->bitlen > 40 + 32*u) + mmsi[u] = UBITS(40 + 32*u, 30); else - mmsi[i] = 0; + mmsi[u] = 0; /*@ -usedef @*/ ais->type7.mmsi1 = mmsi[0]; ais->type7.mmsi2 = mmsi[1]; @@ -766,7 +766,7 @@ bool aivdm_decode(const char *buf, size_t buflen, } ais->type25.addressed = (bool)UBITS(38, 1); ais->type25.structured = (bool)UBITS(39, 1); - if (ais_context->bitlen < (40 + (16*ais->type25.structured) + (30*ais->type25.addressed))) { + if (ais_context->bitlen < (unsigned)(40 + (16*ais->type25.structured) + (30*ais->type25.addressed))) { gpsd_report(LOG_WARN, "AIVDM message type 25 too short for mode.\n"); return false; } |