diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2012-09-22 08:59:54 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2012-09-22 09:01:42 -0400 |
| commit | 7b7806b85096391e364a03ef3551970620b5492e (patch) | |
| tree | ce5416a3f49a79e941e93197c31bdc917ec45d82 /driver_nmea2000.c | |
| parent | 00b768d7ec851a5cff99d5a6ac169e789438001f (diff) | |
| download | gpsd-7b7806b85096391e364a03ef3551970620b5492e.tar.gz | |
Lose the assumption that socket_t is an integer.
Diffstat (limited to 'driver_nmea2000.c')
| -rw-r--r-- | driver_nmea2000.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/driver_nmea2000.c b/driver_nmea2000.c index cea77907..7c2463c2 100644 --- a/driver_nmea2000.c +++ b/driver_nmea2000.c @@ -834,7 +834,7 @@ int nmea2000_open(struct gps_device_t *session) struct sockaddr_can addr; char *unit_ptr; - session->gpsdata.gps_fd = -1; + INVALIDATE_SOCKET(session->gpsdata.gps_fd); session->driver.nmea2000.can_net = 0; can_net = -1; @@ -899,7 +899,7 @@ int nmea2000_open(struct gps_device_t *session) /* Create the socket */ sock = socket(PF_CAN, SOCK_RAW, CAN_RAW); - if (sock == -1) { + if (BAD_SOCKET(sock)) { gpsd_report(LOG_ERROR, "NMEA2000 open: can not get socket.\n"); return -1; } @@ -957,11 +957,11 @@ int nmea2000_open(struct gps_device_t *session) void nmea2000_close(struct gps_device_t *session) { - if (session->gpsdata.gps_fd != -1) { + if (!BAD_SOCKET(session->gpsdata.gps_fd)) { gpsd_report(LOG_SPIN, "close(%d) in nmea2000_close(%s)\n", session->gpsdata.gps_fd, session->gpsdata.dev.path); (void)close(session->gpsdata.gps_fd); - session->gpsdata.gps_fd = -1; + INVALIDATE_SOCKET(session->gpsdata.gps_fd); } } |