summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2015-04-01 04:21:12 -0400
committerEric S. Raymond <esr@thyrsus.com>2015-04-01 04:21:12 -0400
commit0eb3a85ceb4ed9a70697a952e6f10d7b1e9d29f1 (patch)
tree49a51b74924ffa9084477ce036ce489709d03a64
parent27421a355f42c6303cae74a861a86f5c96d29d18 (diff)
downloadgpsd-0eb3a85ceb4ed9a70697a952e6f10d7b1e9d29f1.tar.gz
Increase consistency of names. No code changes.
-rw-r--r--gpsd.c2
-rw-r--r--libgpsd_core.c2
-rw-r--r--ppsthread.c2
-rw-r--r--ppsthread.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/gpsd.c b/gpsd.c
index 0ffb4ccc..269ea904 100644
--- a/gpsd.c
+++ b/gpsd.c
@@ -1528,7 +1528,7 @@ static void all_reports(struct gps_device_t *device, gps_mask_t changed)
/* propagate this in-band-time to all PPS-only devices */
for (ppsonly = devices; ppsonly < devices + MAX_DEVICES; ppsonly++)
if (ppsonly->sourcetype == source_pps)
- pps_thread_fix_in(&ppsonly->pps_thread, &td);
+ pps_thread_fixin(&ppsonly->pps_thread, &td);
#endif /* PPS_ENABLE */
#ifdef NTPSHM_ENABLE
diff --git a/libgpsd_core.c b/libgpsd_core.c
index 183f4f1f..306bca13 100644
--- a/libgpsd_core.c
+++ b/libgpsd_core.c
@@ -1648,7 +1648,7 @@ void ntp_latch(struct gps_device_t *device, struct timedelta_t *td)
#ifdef PPS_ENABLE
/* thread-safe update */
- pps_thread_fix_in(&device->pps_thread, td);
+ pps_thread_fixin(&device->pps_thread, td);
#endif /* PPS_ENABLE */
}
#endif /* NTP_ENABLE */
diff --git a/ppsthread.c b/ppsthread.c
index df46c64f..2705779e 100644
--- a/ppsthread.c
+++ b/ppsthread.c
@@ -1230,7 +1230,7 @@ void pps_thread_deactivate(volatile struct pps_thread_t *pps_thread)
pps_thread->report_hook = NULL;
}
-void pps_thread_fix_in(volatile struct pps_thread_t *pps_thread,
+void pps_thread_fixin(volatile struct pps_thread_t *pps_thread,
volatile struct timedelta_t *fix_in)
/* thread-safe update of last fix time - only way we pass data in */
{
diff --git a/ppsthread.h b/ppsthread.h
index 6dc18964..81faa033 100644
--- a/ppsthread.h
+++ b/ppsthread.h
@@ -54,7 +54,7 @@ struct pps_thread_t {
extern void pps_thread_activate(volatile struct pps_thread_t *);
extern void pps_thread_deactivate(volatile struct pps_thread_t *);
-extern void pps_thread_fix_in(volatile struct pps_thread_t *,
+extern void pps_thread_fixin(volatile struct pps_thread_t *,
volatile struct timedelta_t *);
extern int pps_thread_ppsout(volatile struct pps_thread_t *,
volatile struct timedelta_t *);