diff options
| author | Reinhard Arlt <reinhard.arlt@t-online.de> | 2012-09-23 00:19:07 +0200 |
|---|---|---|
| committer | Reinhard Arlt <reinhard.arlt@t-online.de> | 2012-09-23 00:19:07 +0200 |
| commit | cca828adc6e6054e8d960977c1fac5fd119e261d (patch) | |
| tree | 298b449456f81b001ac440704242887acff74a63 /driver_nmea2000.c | |
| parent | d799f3a3a88ea1832c550e9223b1426966fce1cb (diff) | |
| parent | 462c4f60c92ccf28dbcab56a6c1befe1722a6374 (diff) | |
| download | gpsd-cca828adc6e6054e8d960977c1fac5fd119e261d.tar.gz | |
Merge branch 'master' of git://git.sv.gnu.org/gpsd
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 1715b1b6..919e7d8e 100644 --- a/driver_nmea2000.c +++ b/driver_nmea2000.c @@ -896,7 +896,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; @@ -961,7 +961,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; } @@ -1019,11 +1019,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); } } |