diff options
| -rw-r--r-- | gpsd.c | 6 | ||||
| -rw-r--r-- | gpsd.h-tail | 6 | ||||
| -rw-r--r-- | gpsd_json.c | 6 | ||||
| -rw-r--r-- | gpsdecode.c | 8 |
4 files changed, 13 insertions, 13 deletions
@@ -1296,7 +1296,7 @@ static void json_report(struct subscriber_t *sub, * and just pass the through here. */ if ((changed & SUBFRAME_IS) != 0) { - subframe_json_dump(&device->gpsdata.subframe, + json_subframe_dump(&device->gpsdata.subframe, sub->policy.scaled, buf, sizeof(buf)); (void)throttled_write(sub, buf, strlen(buf)); @@ -1310,14 +1310,14 @@ static void json_report(struct subscriber_t *sub, #endif /* COMPASS_ENABLE */ #ifdef RTCM104V2_ENABLE if ((changed & RTCM2_IS) != 0) { - rtcm2_json_dump(&device->gpsdata.rtcm2, buf, + json_rtcm2_dump(&device->gpsdata.rtcm2, buf, sizeof(buf)); (void)throttled_write(sub, buf, strlen(buf)); } #endif /* RTCM104V2_ENABLE */ #ifdef AIVDM_ENABLE if ((changed & AIS_IS) != 0) { - aivdm_json_dump(&device->gpsdata.ais, + json_aivdm_dump(&device->gpsdata.ais, sub->policy.scaled, buf, sizeof(buf)); (void)throttled_write(sub, buf, strlen(buf)); diff --git a/gpsd.h-tail b/gpsd.h-tail index 4faeda51..e26ecca5 100644 --- a/gpsd.h-tail +++ b/gpsd.h-tail @@ -149,10 +149,10 @@ extern unsigned int isgps_parity(isgps30bits_t); extern void isgps_output_magnavox(const isgps30bits_t *, unsigned int, FILE *); extern enum isgpsstat_t rtcm2_decode(struct gps_packet_t *, unsigned int); -extern void subframe_json_dump(const struct subframe_t *, bool scaled, +extern void json_subframe_dump(const struct subframe_t *, bool scaled, /*@out@*/ char buf[], size_t); extern void rtcm2_sager_dump(const struct rtcm2_t *, /*@out@*/char[], size_t); -extern void rtcm2_json_dump(const struct rtcm2_t *, /*@out@*/char[], size_t); +extern void json_rtcm2_dump(const struct rtcm2_t *, /*@out@*/char[], size_t); extern int rtcm2_undump(/*@out@*/struct rtcm2_t *, char *); extern void rtcm2_unpack(/*@out@*/struct rtcm2_t *, char *); extern void rtcm3_unpack(/*@out@*/struct rtcm3_t *, char *); @@ -643,7 +643,7 @@ extern bool ubx_write(struct gps_device_t *, unsigned int, unsigned int, extern bool aivdm_decode(const char *, size_t, struct aivdm_context_t [], struct ais_t *); -extern void aivdm_json_dump(const struct ais_t *, bool, /*@out@*/char *, size_t); +extern void json_aivdm_dump(const struct ais_t *, bool, /*@out@*/char *, size_t); #endif /* AIVDM_ENABLE */ #ifdef MTK3301_ENABLE extern gps_mask_t processMTK3301(int c UNUSED, char *field[], struct gps_device_t *session); diff --git a/gpsd_json.c b/gpsd_json.c index a3f246ab..b227be4b 100644 --- a/gpsd_json.c +++ b/gpsd_json.c @@ -357,7 +357,7 @@ void json_watch_dump(const struct policy_t *ccp, /*@+compdef@*/ } -void subframe_json_dump(const struct subframe_t *subframe, bool scaled, +void json_subframe_dump(const struct subframe_t *subframe, bool scaled, /*@out@*/ char buf[], size_t buflen) { size_t len = 0; @@ -653,7 +653,7 @@ void subframe_json_dump(const struct subframe_t *subframe, bool scaled, } #if defined(RTCM104V2_ENABLE) -void rtcm2_json_dump(const struct rtcm2_t *rtcm, /*@out@*/ char buf[], +void json_rtcm2_dump(const struct rtcm2_t *rtcm, /*@out@*/ char buf[], size_t buflen) /* dump the contents of a parsed RTCM104 message as JSON */ { @@ -776,7 +776,7 @@ void rtcm2_json_dump(const struct rtcm2_t *rtcm, /*@out@*/ char buf[], #if defined(AIVDM_ENABLE) -void aivdm_json_dump(const struct ais_t *ais, bool scaled, +void json_aivdm_dump(const struct ais_t *ais, bool scaled, /*@out@*/ char *buf, size_t buflen) { char buf1[JSON_VAL_MAX * 2 + 1]; diff --git a/gpsdecode.c b/gpsdecode.c index 4cb87d3a..08dae486 100644 --- a/gpsdecode.c +++ b/gpsdecode.c @@ -376,7 +376,7 @@ static void decode(FILE * fpin, FILE * fpout) else if (lexer.type == RTCM2_PACKET) { rtcm2_unpack(&rtcm2, (char *)lexer.isgps.buf); if (json) - rtcm2_json_dump(&rtcm2, buf, sizeof(buf)); + json_rtcm2_dump(&rtcm2, buf, sizeof(buf)); else rtcm2_sager_dump(&rtcm2, buf, sizeof(buf)); (void)fputs(buf, fpout); @@ -397,7 +397,7 @@ static void decode(FILE * fpin, FILE * fpout) if (!json) aivdm_csv_dump(&ais, buf, sizeof(buf)); else - aivdm_json_dump(&ais, scaled, buf, sizeof(buf)); + json_aivdm_dump(&ais, scaled, buf, sizeof(buf)); (void)fputs(buf, fpout); } @@ -433,12 +433,12 @@ static void encode(FILE * fpin, FILE * fpout) if ((gpsdata.set & RTCM2_SET) != 0) { /* this works */ char outbuf[BUFSIZ]; - rtcm2_json_dump(&gpsdata.rtcm2, outbuf, sizeof(outbuf)); + json_rtcm2_dump(&gpsdata.rtcm2, outbuf, sizeof(outbuf)); (void)fputs(outbuf, fpout); } if ((gpsdata.set & AIS_SET) != 0) { char outbuf[BUFSIZ]; - aivdm_json_dump(&gpsdata.ais, false, outbuf, sizeof(outbuf)); + json_aivdm_dump(&gpsdata.ais, false, outbuf, sizeof(outbuf)); (void)fputs(outbuf, fpout); } } |