diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2015-03-16 10:26:18 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2015-03-16 20:08:57 -0400 |
| commit | 85a4f95b6ee7ad0e21e2444ded91813888b03212 (patch) | |
| tree | 61d77eddf0ffa0c2eecc749800fc9a232cb481d6 /driver_nmea2000.c | |
| parent | ac5ab2343e93ac141460ab23954ea53ba66517fb (diff) | |
| download | gpsd-85a4f95b6ee7ad0e21e2444ded91813888b03212.tar.gz | |
NMEA2000 driver was not using a bool where it should.
Diffstat (limited to 'driver_nmea2000.c')
| -rw-r--r-- | driver_nmea2000.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/driver_nmea2000.c b/driver_nmea2000.c index 5b1e207d..2fb55341 100644 --- a/driver_nmea2000.c +++ b/driver_nmea2000.c @@ -1342,14 +1342,14 @@ static void find_pgn(struct can_frame *frame, struct gps_device_t *session) #endif } - if (session->driver.nmea2000.unit_valid == 0) { + if (!session->driver.nmea2000.unit_valid) { unsigned int l1, l2; for (l1=0;l1<NMEA2000_NETS;l1++) { for (l2=0;l2<NMEA2000_UNITS;l2++) { if (session == nmea2000_units[l1][l2]) { session->driver.nmea2000.unit = l2; - session->driver.nmea2000.unit_valid = 1; + session->driver.nmea2000.unit_valid = true; session->driver.nmea2000.can_net = l1; can_net = l1; } @@ -1357,9 +1357,9 @@ static void find_pgn(struct can_frame *frame, struct gps_device_t *session) } } - if (session->driver.nmea2000.unit_valid == 0) { + if (!session->driver.nmea2000.unit_valid) { session->driver.nmea2000.unit = source_unit; - session->driver.nmea2000.unit_valid = 1; + session->driver.nmea2000.unit_valid = true; nmea2000_units[can_net][source_unit] = session; } @@ -1651,12 +1651,12 @@ int nmea2000_open(struct gps_device_t *session) if (unit_ptr != NULL) { nmea2000_units[can_net][unit_number] = session; session->driver.nmea2000.unit = unit_number; - session->driver.nmea2000.unit_valid = 1; + session->driver.nmea2000.unit_valid = true; } else { strncpy(can_interface_name[can_net], interface_name, MIN(sizeof(can_interface_name[0]), sizeof(interface_name))); - session->driver.nmea2000.unit_valid = 0; + session->driver.nmea2000.unit_valid = false; for (l=0;l<NMEA2000_UNITS;l++) { nmea2000_units[can_net][l] = NULL; } @@ -1678,13 +1678,13 @@ void nmea2000_close(struct gps_device_t *session) (void)close(session->gpsdata.gps_fd); INVALIDATE_SOCKET(session->gpsdata.gps_fd); - if (session->driver.nmea2000.unit_valid != 0) { + if (session->driver.nmea2000.unit_valid) { unsigned int l1, l2; for (l1=0;l1<NMEA2000_NETS;l1++) { for (l2=0;l2<NMEA2000_UNITS;l2++) { if (session == nmea2000_units[l1][l2]) { - session->driver.nmea2000.unit_valid = 0; + session->driver.nmea2000.unit_valid = false; session->driver.nmea2000.unit = 0; session->driver.nmea2000.can_net = 0; nmea2000_units[l1][l2] = NULL; |