summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary E. Miller <gem@rellim.com>2015-04-30 13:46:00 -0700
committerGary E. Miller <gem@rellim.com>2015-04-30 13:46:00 -0700
commit77e283cc8fda4ced8527a2cfc6fd4c863d9b86a4 (patch)
tree4f3a72f05f335d28660b852b16b4d930567e2b51
parenta5a4102ddba7e8f873a83d08328949c64240db96 (diff)
downloadgpsd-77e283cc8fda4ced8527a2cfc6fd4c863d9b86a4.tar.gz
More trailing whitespace fixups.
-rw-r--r--monitor_nmea0183.c2
-rw-r--r--monitor_ubx.c2
-rw-r--r--net_ntrip.c10
-rw-r--r--ntpshmmon.c4
-rw-r--r--ntpshmread.c4
-rw-r--r--ntpshmwrite.c6
-rw-r--r--packet.c14
-rw-r--r--ppsthread.c18
-rw-r--r--pseudoais.c12
-rw-r--r--pseudonmea.c6
10 files changed, 39 insertions, 39 deletions
diff --git a/monitor_nmea0183.c b/monitor_nmea0183.c
index ff34b8f9..e664f9a6 100644
--- a/monitor_nmea0183.c
+++ b/monitor_nmea0183.c
@@ -220,7 +220,7 @@ static void nmea_update(void)
/* can be NULL if packet was overlong */
fields = session.nmea.field;
- if (session.lexer.outbuffer[0] == (unsigned char)'$'
+ if (session.lexer.outbuffer[0] == (unsigned char)'$'
&& fields != NULL && fields[0] != NULL) {
int ymax, xmax;
timestamp_t now;
diff --git a/monitor_ubx.c b/monitor_ubx.c
index 11a290bf..4425d351 100644
--- a/monitor_ubx.c
+++ b/monitor_ubx.c
@@ -34,7 +34,7 @@ static bool ubx_initialize(void)
/* "heavily inspired" by monitor_nmea.c */
if ((navsolwin = derwin(devicewin, 13, 51, 0, 28)) == NULL)
- return false;
+ return false;
(void)wborder(navsolwin, 0, 0, 0, 0, 0, 0, 0, 0),
(void)wattrset(navsolwin, A_BOLD);
(void)wmove(navsolwin, 1, 1);
diff --git a/net_ntrip.c b/net_ntrip.c
index 8fc3b676..25b71205 100644
--- a/net_ntrip.c
+++ b/net_ntrip.c
@@ -178,7 +178,7 @@ static int ntrip_sourcetable_parse(struct gps_device_t *device)
if (match) {
return 1;
}
- gpsd_log(&device->context->errout, LOG_ERROR,
+ gpsd_log(&device->context->errout, LOG_ERROR,
"ntrip stream read error %d on fd %d\n",
errno, fd);
return -1;
@@ -232,7 +232,7 @@ static int ntrip_sourcetable_parse(struct gps_device_t *device)
/* parse STR */
if (str_starts_with(line, NTRIP_STR)) {
ntrip_str_parse(line + strlen(NTRIP_STR),
- (size_t) (llen - strlen(NTRIP_STR)),
+ (size_t) (llen - strlen(NTRIP_STR)),
&hold, &device->context->errout);
if (strcmp(device->ntrip.stream.mountpoint, hold.mountpoint) == 0) {
/* todo: support for RTCM 3.0, SBAS (WAAS, EGNOS), ... */
@@ -321,7 +321,7 @@ static int ntrip_stream_req_probe(const struct ntrip_stream_t *stream,
"\r\n", VERSION, stream->url);
r = write(dsock, buf, strlen(buf));
if (r != (ssize_t)strlen(buf)) {
- gpsd_log(errout, LOG_ERROR,
+ gpsd_log(errout, LOG_ERROR,
"ntrip stream write error %d on fd %d during probe request %zd\n",
errno, dsock, r);
(void)close(dsock);
@@ -393,7 +393,7 @@ static int ntrip_stream_get_req(const struct ntrip_stream_t *stream,
}
static int ntrip_stream_get_parse(const struct ntrip_stream_t *stream,
- const int dsock,
+ const int dsock,
const struct gpsd_errout_t *errout)
{
char buf[BUFSIZ];
@@ -402,7 +402,7 @@ static int ntrip_stream_get_parse(const struct ntrip_stream_t *stream,
while (read(dsock, buf, sizeof(buf) - 1) == -1) {
if (errno == EINTR)
continue;
- gpsd_log(errout, LOG_ERROR,
+ gpsd_log(errout, LOG_ERROR,
"ntrip stream read error %d on fd %d during get rsp\n", errno,
dsock);
goto close;
diff --git a/ntpshmmon.c b/ntpshmmon.c
index 6ccc21a0..ebf48a01 100644
--- a/ntpshmmon.c
+++ b/ntpshmmon.c
@@ -121,7 +121,7 @@ int main(int argc, char **argv)
break;
}
}
-
+
/*
* Even on a 1 Hz PPS, a sleep(1) may end up
* being sleep(1.1) and missing a beat. Since
@@ -129,7 +129,7 @@ int main(int argc, char **argv)
* at interval < 1 sec shouldn't be a problem.
*/
(void)usleep((useconds_t)(cycle * 1000));
- } while
+ } while
(nsamples != 0 && time(NULL) - starttime < timeout);
exit(EXIT_SUCCESS);
diff --git a/ntpshmread.c b/ntpshmread.c
index c75410be..7e5ceff6 100644
--- a/ntpshmread.c
+++ b/ntpshmread.c
@@ -96,9 +96,9 @@ enum segstat_t ntp_read(struct shmTime *shm_in, struct shm_stat_t *shm_stat, con
shm->valid = 0;
memory_barrier();
- /*
+ /*
* Clash detection in case neither (a) nor (b) was true.
- * Not supported in mode 0, and word access to the count field
+ * Not supported in mode 0, and word access to the count field
* must be atomic for this to work.
*/
if (shmcopy.mode > 0 && cnt != shm->count) {
diff --git a/ntpshmwrite.c b/ntpshmwrite.c
index 563102be..addc1f41 100644
--- a/ntpshmwrite.c
+++ b/ntpshmwrite.c
@@ -21,15 +21,15 @@
#define LEAP_NOWARNING 0x0 /* normal, no leap second warning */
-void ntp_write(volatile struct shmTime *shmseg,
+void ntp_write(volatile struct shmTime *shmseg,
struct timedelta_t *td, int precision, int leap_notify)
/* put a received fix time into shared memory for NTP */
{
struct tm tm;
- /* insist that leap seconds only happen in june and december
+ /* insist that leap seconds only happen in june and december
* GPS emits leap pending for 3 months prior to insertion
- * NTP expects leap pending for only 1 month prior to insertion
+ * NTP expects leap pending for only 1 month prior to insertion
* Per http://bugs.ntp.org/1090 */
(void)gmtime_r( &(td->real.tv_sec), &tm);
if ( 5 != tm.tm_mon && 11 != tm.tm_mon ) {
diff --git a/packet.c b/packet.c
index f02e7aae..c8b64f50 100644
--- a/packet.c
+++ b/packet.c
@@ -106,7 +106,7 @@ PERMISSIONS
* $P -- Vendor-specific sentence
*
* !AB -- NMEA 4.0 Base AIS station
- * !AD -- MMEA 4.0 Dependent AIS Base Station
+ * !AD -- MMEA 4.0 Dependent AIS Base Station
* !AI -- Mobile AIS station
* !AN -- NMEA 4.0 Aid to Navigation AIS station
* !AR -- NMEA 4.0 AIS Receiving Station
@@ -1752,7 +1752,7 @@ void packet_parse(struct gps_lexer_t *lexer)
* 0x4c, Operating Parameters Report, data length 17
* 0x54, One Satellite Bias, data length 4
* 0x56, Velocity Fix (ENU), data length 20
- * 0x57, Last Computed Fix Report, data length 8
+ * 0x57, Last Computed Fix Report, data length 8
* 0x5a, Raw Measurements
* 0x5b, Satellite Ephemeris Status, data length 16
* 0x5c, Satellite Tracking Status, data length 24
@@ -1766,9 +1766,9 @@ void packet_parse(struct gps_lexer_t *lexer)
*
* <DLE>[pkt id] [data] <DLE><ETX>
*
- * The best description is in [TSIP], the Trimble Standard
+ * The best description is in [TSIP], the Trimble Standard
* Interface Protocol manual; unless otherwise specified
- * that is where these type/length notifications are from.
+ * that is where these type/length notifications are from.
*
* Note that not all Trimble chips conform perfectly to this
* specification, nor does it cover every packet type we
@@ -1776,9 +1776,9 @@ void packet_parse(struct gps_lexer_t *lexer)
*/
pkt_id = lexer->inbuffer[1]; /* packet ID */
/* *INDENT-OFF* */
- if (!((0x13 == pkt_id) ||
- (0x1c == pkt_id) ||
- (0xbb == pkt_id) ||
+ if (!((0x13 == pkt_id) ||
+ (0x1c == pkt_id) ||
+ (0xbb == pkt_id) ||
(0xbc == pkt_id) ||
(0x38 == pkt_id))
&& ((0x41 > pkt_id) || (0x8f < pkt_id))) {
diff --git a/ppsthread.c b/ppsthread.c
index b18bf928..5fae444d 100644
--- a/ppsthread.c
+++ b/ppsthread.c
@@ -188,7 +188,7 @@ static int init_kernel_pps(struct inner_context_t *inner_context)
* Allow user to pass in an explicit PPS device path.
*
* (We use strncpy() here because this might be compiled where
- * strlcpy() is not available.)
+ * strlcpy() is not available.)
*/
if (strncmp(pps_thread->devicename, "/dev/pps", 8) == 0)
(void)strncpy(path, pps_thread->devicename, sizeof(path));
@@ -306,7 +306,7 @@ static int init_kernel_pps(struct inner_context_t *inner_context)
/* have kernel PPS handle */
/* get RFC2783 features supported */
inner_context->pps_caps = 0;
- if ( 0 > time_pps_getcap(inner_context->kernelpps_handle,
+ if ( 0 > time_pps_getcap(inner_context->kernelpps_handle,
&inner_context->pps_caps)) {
char errbuf[BUFSIZ] = "unknown error";
inner_context->pps_caps = 0;
@@ -882,7 +882,7 @@ static void *gpsd_ppsmonitor(void *arg)
|| (900000 < cycle && 1100000 > cycle) /* 1Hz */
|| (1800000 < cycle && 2200000 > cycle) ) { /* 2Hz */
- /* some pulses may be so short that state never changes
+ /* some pulses may be so short that state never changes
* and some RFC2783 only can detect one edge */
duration = 0;
@@ -930,10 +930,10 @@ static void *gpsd_ppsmonitor(void *arg)
*
* You may think that PPS is very accurate, so the cycle time
* valid window should be very small. This is not the case,
- * The Rasberry Pi clock is very coarse when it starts and chronyd
- * may be doing a fast slew. chronyd by default will slew up
- * to 8.334%! So the cycle time as measured by the system clock
- * may be almost +/- 9%. Therefore, gpsd uses a 10% window.
+ * The Rasberry Pi clock is very coarse when it starts and chronyd
+ * may be doing a fast slew. chronyd by default will slew up
+ * to 8.334%! So the cycle time as measured by the system clock
+ * may be almost +/- 9%. Therefore, gpsd uses a 10% window.
* Don't worry, ntpd and chronyd will do further validation.
*/
@@ -1058,7 +1058,7 @@ static void *gpsd_ppsmonitor(void *arg)
/*
* We get the time of the last fix recorded before the PPS came in,
- * which is for the previous cycle. Only works for integral cycle
+ * which is for the previous cycle. Only works for integral cycle
* times, but more than 1Hz is pointless.
*/
@@ -1146,7 +1146,7 @@ void pps_thread_activate(volatile struct pps_thread_t *pps_thread)
{
int retval;
pthread_t pt;
- /*
+ /*
* FIXME: this launch code is not itself thread-safe!
* It would be if inner_context could be auto, but the monitor
* routine gets garbage when we try that. Ideally the body
diff --git a/pseudoais.c b/pseudoais.c
index 5c40e91b..9c0503c6 100644
--- a/pseudoais.c
+++ b/pseudoais.c
@@ -51,7 +51,7 @@ static void ais_addbits(unsigned char *bits,
for(l=0;l<len;l++) {
if (data & mask) {
- bits[pos] |= mask1;
+ bits[pos] |= mask1;
}
mask <<= 1;
mask1 <<= 1;
@@ -71,7 +71,7 @@ static void ais_addchar(unsigned char *bits,
{
unsigned int l;
unsigned int flag;
-
+
for(l=0,flag=0;l<len;l++) {
unsigned char a, b;
@@ -84,7 +84,7 @@ static void ais_addchar(unsigned char *bits,
} else {
b = (unsigned char) '\0';
}
- ais_addbits(bits, start+6*l, 6, (uint64_t)b);
+ ais_addbits(bits, start+6*l, 6, (uint64_t)b);
}
return;
}
@@ -96,9 +96,9 @@ static void ais_adddata(unsigned char *bits,
char *data)
{
unsigned int l;
-
+
for(l=0;l<len;l++) {
- ais_addbits(bits, start+6*l, 6, (uint64_t)data[l]);
+ ais_addbits(bits, start+6*l, 6, (uint64_t)data[l]);
}
return;
}
@@ -127,7 +127,7 @@ unsigned int ais_binary_encode(struct ais_t *ais,
unsigned int len;
len = 0;
-
+
if (flag != 0) {
flag = AIS_MSG_PART2_FLAG;
}
diff --git a/pseudonmea.c b/pseudonmea.c
index 5239069d..2b9bf7c3 100644
--- a/pseudonmea.c
+++ b/pseudonmea.c
@@ -264,7 +264,7 @@ static void gpsd_binary_almanac_dump(struct gps_device_t *session,
#ifdef AIVDM_ENABLE
-#define GETLEFT(a) (((a%6) == 0) ? 0 : (6 - (a%6)))
+#define GETLEFT(a) (((a%6) == 0) ? 0 : (6 - (a%6)))
static void gpsd_binary_ais_dump(struct gps_device_t *session,
char bufp[], size_t len)
@@ -277,12 +277,12 @@ static void gpsd_binary_ais_dump(struct gps_device_t *session,
unsigned int left;
unsigned int datalen;
unsigned int offset;
-
+
channel = 'A';
if (session->driver.aivdm.ais_channel == 'B') {
channel = 'B';
}
-
+
memset(data, 0, sizeof(data));
datalen = ais_binary_encode(&session->gpsdata.ais, &data[0], 0);
if (datalen > 6*60) {