diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2006-10-30 04:50:27 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2006-10-30 04:50:27 +0000 |
| commit | 450333d95d179e0455339d7bc5d8c31f9cf0306f (patch) | |
| tree | 9c7b09e6d97e620e97947ae0f1fe8845126ec916 /libgpsd_core.c | |
| parent | 736e234ca0686c76e460f8bff42e29a8d1bb2151 (diff) | |
| download | gpsd-450333d95d179e0455339d7bc5d8c31f9cf0306f.tar.gz | |
Clean up some unfortunate nomenclature discovered while working on gpscntrl.
Diffstat (limited to 'libgpsd_core.c')
| -rw-r--r-- | libgpsd_core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libgpsd_core.c b/libgpsd_core.c index b1c87e44..685d9f9c 100644 --- a/libgpsd_core.c +++ b/libgpsd_core.c @@ -89,8 +89,8 @@ void gpsd_deactivate(struct gps_device_t *session) gpsd_report(1, "closing GPS=%s (%d)\n", session->gpsdata.gps_device, session->gpsdata.gps_fd); #ifdef NTPSHM_ENABLE - (void)ntpshm_free(session->context, session->shmTime); - session->shmTime = -1; + (void)ntpshm_free(session->context, session->shmindex); + session->shmindex = -1; # ifdef PPS_ENABLE (void)ntpshm_free(session->context, session->shmTimeP); session->shmTimeP = -1; @@ -207,9 +207,9 @@ int gpsd_activate(struct gps_device_t *session) #endif /* BINARY_ENABLE */ #ifdef NTPSHM_ENABLE - session->shmTime = ntpshm_alloc(session->context); + session->shmindex = ntpshm_alloc(session->context); #if defined(PPS_ENABLE) && defined(TIOCMIWAIT) - if (session->shmTime >= 0 && session->context->shmTimePPS) { + if (session->shmindex >= 0 && session->context->shmTimePPS) { if ((session->shmTimeP = ntpshm_alloc(session->context)) >= 0) /*@i1@*/(void)pthread_create(&pt,NULL,gpsd_ppsmonitor,(void *)session); } |