diff options
author | Gary E. Miller <gem@rellim.com> | 2018-07-26 12:52:58 -0700 |
---|---|---|
committer | Gary E. Miller <gem@rellim.com> | 2018-07-26 12:52:58 -0700 |
commit | 25edf0e836200ee4f6cf86fa4456635ee210484f (patch) | |
tree | 27b0909c19a9fc19c7b13052f6ab479df0f75ba2 | |
parent | 75f90d6aa743cec68afa545ad1d5bcb539a79d93 (diff) | |
download | gpsd-25edf0e836200ee4f6cf86fa4456635ee210484f.tar.gz |
Savannah issue #53671: policy_t -> gps_policy_t.
This is to prevent a conflict with Boost version 1.67.
No functional change.
-rw-r--r-- | gps.h | 4 | ||||
-rw-r--r-- | gps_json.h | 8 | ||||
-rw-r--r-- | gpsd.c | 8 | ||||
-rw-r--r-- | gpsd_json.c | 6 | ||||
-rw-r--r-- | gpsdecode.c | 4 | ||||
-rw-r--r-- | shared_json.c | 2 | ||||
-rw-r--r-- | test_libgps.c | 2 |
7 files changed, 17 insertions, 17 deletions
@@ -1917,7 +1917,7 @@ struct devconfig_t { int driver_mode; /* is driver in native mode or not? */ }; -struct policy_t { +struct gps_policy_t { bool watcher; /* is watcher mode on? */ bool json; /* requesting JSON? */ bool nmea; /* requesting dumping as NMEA? */ @@ -2056,7 +2056,7 @@ struct gps_data_t { struct devconfig_t dev; /* device that shipped last update */ - struct policy_t policy; /* our listening policy */ + struct gps_policy_t policy; /* our listening policy */ struct { timestamp_t time; @@ -18,19 +18,19 @@ struct gps_device_t; void json_data_report(const gps_mask_t, const struct gps_device_t *, - const struct policy_t *, + const struct gps_policy_t *, char *, size_t); char *json_stringify(char *, size_t, const char *); void json_tpv_dump(const struct gps_device_t *, - const struct policy_t *, char *, size_t); + const struct gps_policy_t *, char *, size_t); void json_noise_dump(const struct gps_data_t *, char *, size_t); void json_sky_dump(const struct gps_data_t *, char *, size_t); void json_att_dump(const struct gps_data_t *, char *, size_t); void json_oscillator_dump(const struct gps_data_t *, char *, size_t); void json_subframe_dump(const struct gps_data_t *, char buf[], size_t); void json_device_dump(const struct gps_device_t *, char *, size_t); -void json_watch_dump(const struct policy_t *, char *, size_t); -int json_watch_read(const char *, struct policy_t *, +void json_watch_dump(const struct gps_policy_t *, char *, size_t); +int json_watch_read(const char *, struct gps_policy_t *, const char **); int json_device_read(const char *, struct devconfig_t *, const char **); @@ -518,10 +518,10 @@ static int passivesocks(char *service, char *tcp_or_udp, struct subscriber_t { - int fd; /* client file descriptor. -1 if unused */ - time_t active; /* when subscriber last polled for data */ - struct policy_t policy; /* configurable bits */ - pthread_mutex_t mutex; /* serialize access to fd */ + int fd; /* client file descriptor. -1 if unused */ + time_t active; /* when subscriber last polled for data */ + struct gps_policy_t policy; /* configurable bits */ + pthread_mutex_t mutex; /* serialize access to fd */ }; #define subscribed(sub, devp) (sub->policy.watcher && (sub->policy.devpath[0]=='\0' || strcmp(sub->policy.devpath, devp->gpsdata.dev.path)==0)) diff --git a/gpsd_json.c b/gpsd_json.c index e5390866..6b4c610e 100644 --- a/gpsd_json.c +++ b/gpsd_json.c @@ -138,7 +138,7 @@ void json_version_dump( char *reply, size_t replylen) void json_tpv_dump(const struct gps_device_t *session, - const struct policy_t *policy CONDITIONALLY_UNUSED, + const struct gps_policy_t *policy CONDITIONALLY_UNUSED, char *reply, size_t replylen) { const struct gps_data_t *gpsdata = &session->gpsdata; @@ -407,7 +407,7 @@ void json_device_dump(const struct gps_device_t *device, (void)strlcat(reply, "}\r\n", replylen); } -void json_watch_dump(const struct policy_t *ccp, +void json_watch_dump(const struct gps_policy_t *ccp, char *reply, size_t replylen) { (void)snprintf(reply, replylen, @@ -3432,7 +3432,7 @@ void json_oscillator_dump(const struct gps_data_t *datap, void json_data_report(const gps_mask_t changed, const struct gps_device_t *session, - const struct policy_t *policy, + const struct gps_policy_t *policy, char *buf, size_t buflen) /* report a session state in JSON */ { diff --git a/gpsdecode.c b/gpsdecode.c index 2b249fae..2916deee 100644 --- a/gpsdecode.c +++ b/gpsdecode.c @@ -551,7 +551,7 @@ static void decode(FILE *fpin, FILE*fpout) /* sensor data on fpin to dump format on fpout */ { struct gps_device_t session; - struct policy_t policy; + struct gps_policy_t policy; size_t minima[PACKET_TYPES+1]; #if defined(SOCKET_EXPORT_ENABLE) || defined(AIVDM_ENABLE) char buf[GPS_JSON_RESPONSE_MAX * 4]; @@ -649,7 +649,7 @@ static void encode(FILE *fpin, FILE *fpout) /* JSON format on fpin to JSON on fpout - idempotency test */ { char inbuf[BUFSIZ]; - struct policy_t policy; + struct gps_policy_t policy; struct gps_device_t session; int lineno = 0; diff --git a/shared_json.c b/shared_json.c index 89987edf..3b1fc4ba 100644 --- a/shared_json.c +++ b/shared_json.c @@ -76,7 +76,7 @@ int json_device_read(const char *buf, } int json_watch_read(const char *buf, - struct policy_t *ccp, + struct gps_policy_t *ccp, const char **endptr) { bool dummy_pps_flag; diff --git a/test_libgps.c b/test_libgps.c index d0837188..e14feab7 100644 --- a/test_libgps.c +++ b/test_libgps.c @@ -65,7 +65,7 @@ int main(int argc, char *argv[]) sizeof(struct gps_data_t), sizeof(struct rtcm2_t), sizeof(struct rtcm3_t), sizeof(struct ais_t), sizeof(struct attitude_t), sizeof(struct rawdata_t), - sizeof(collect.devices), sizeof(struct policy_t), + sizeof(collect.devices), sizeof(struct gps_policy_t), sizeof(struct version_t), sizeof(struct gst_t)); exit(EXIT_SUCCESS); #ifdef CLIENTDEBUG_ENABLE |