diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2014-09-11 23:47:18 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2014-09-11 23:50:20 -0400 |
| commit | eb9317f72e38d4e7428dcf3f07b820cc64f7d088 (patch) | |
| tree | 549d9a805546983fadc0d524c224709422e72eab /driver_ais.c | |
| parent | b8b0d733fcf22550033bdcf38962edc1b44eea54 (diff) | |
| download | gpsd-eb9317f72e38d4e7428dcf3f07b820cc64f7d088.tar.gz | |
Use a standard name for a magic number. All regression tests pass.
Diffstat (limited to 'driver_ais.c')
| -rw-r--r-- | driver_ais.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/driver_ais.c b/driver_ais.c index d80999b9..60dec580 100644 --- a/driver_ais.c +++ b/driver_ais.c @@ -70,7 +70,6 @@ bool ais_binary_decode(const struct gpsd_errout_t *errout, #ifdef S_SPLINT_S assert(type24_queue != NULL); #endif /* S_SPLINT_S */ -#define BITS_PER_BYTE 8 #define UBITS(s, l) ubits((unsigned char *)bits, s, l, false) #define SBITS(s, l) sbits((signed char *)bits, s, l, false) #define UCHARS(s, to) from_sixbit((unsigned char *)bits, s, sizeof(to)-1, to) @@ -427,7 +426,7 @@ bool ais_binary_decode(const struct gpsd_errout_t *errout, } if (!ais->type6.structured) (void)memcpy(ais->type6.bitdata, - (char *)bits + (88 / BITS_PER_BYTE), + (char *)bits + (88 / CHAR_BIT), (ais->type6.bitcount + CHAR_BIT - 1) / CHAR_BIT); break; case 7: /* Binary acknowledge */ @@ -735,7 +734,7 @@ bool ais_binary_decode(const struct gpsd_errout_t *errout, /* land here if we failed to match a known DAC/FID */ if (!ais->type8.structured) (void)memcpy(ais->type8.bitdata, - (char *)bits + (56 / BITS_PER_BYTE), + (char *)bits + (56 / CHAR_BIT), (ais->type8.bitcount + CHAR_BIT - 1) / CHAR_BIT); break; case 9: /* Standard SAR Aircraft Position Report */ @@ -815,7 +814,7 @@ bool ais_binary_decode(const struct gpsd_errout_t *errout, //ais->type17.spare = UBITS(75, 4); ais->type17.bitcount = bitlen - 80; (void)memcpy(ais->type17.bitdata, - (char *)bits + (80 / BITS_PER_BYTE), + (char *)bits + (80 / CHAR_BIT), (ais->type17.bitcount + CHAR_BIT - 1) / CHAR_BIT); break; case 18: /* Standard Class B CS Position Report */ @@ -1095,7 +1094,6 @@ bool ais_binary_decode(const struct gpsd_errout_t *errout, #undef UCHARS #undef SBITS #undef UBITS -#undef BITS_PER_BYTE /* data is fully decoded */ return true; |