diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2010-04-14 04:03:35 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2010-04-14 04:03:35 -0400 |
| commit | 1876159a5a80ae8c6eca24ba128e134edd0fe125 (patch) | |
| tree | 98b4b2d58bc51411bbafdb3464d3fcaa7f7722af /rtcm2_json.c | |
| parent | 500788149a670f20495c1ed9b8a5ba23b4d737b7 (diff) | |
| download | gpsd-1876159a5a80ae8c6eca24ba128e134edd0fe125.tar.gz | |
Re-indent JSON support. All regression tests pass.
Diffstat (limited to 'rtcm2_json.c')
| -rw-r--r-- | rtcm2_json.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/rtcm2_json.c b/rtcm2_json.c index 697c2bc1..87a450fc 100644 --- a/rtcm2_json.c +++ b/rtcm2_json.c @@ -24,14 +24,13 @@ PERMISSIONS /* common fields in every RTCM2 message */ -int json_rtcm2_read(const char *buf, - char *path, size_t pathlen, - struct rtcm2_t *rtcm2, - /*@null@*/const char **endptr) +int json_rtcm2_read(const char *buf, + char *path, size_t pathlen, struct rtcm2_t *rtcm2, + /*@null@*/ const char **endptr) { static char *stringptrs[NITEMS(rtcm2->words)]; - static char stringstore[sizeof(rtcm2->words)*2]; + static char stringstore[sizeof(rtcm2->words) * 2]; static int stringcount; /* *INDENT-OFF* */ @@ -175,19 +174,23 @@ int json_rtcm2_read(const char *buf, memset(rtcm2, '\0', sizeof(struct rtcm2_t)); - if (strstr(buf, "\"type\":1,")!=NULL || strstr(buf, "\"type\":9,")!=NULL) { + if (strstr(buf, "\"type\":1,") != NULL + || strstr(buf, "\"type\":9,") != NULL) { status = json_read_object(buf, json_rtcm1, endptr); if (status == 0) rtcm2->ranges.nentries = (unsigned)satcount; } else if (strstr(buf, "\"type\":3,") != NULL) { status = json_read_object(buf, json_rtcm3, endptr); if (status == 0) { - rtcm2->ecef.valid = (isnan(rtcm2->ecef.x)==0)&&(isnan(rtcm2->ecef.y)==0)&&(isnan(rtcm2->ecef.z)==0); + rtcm2->ecef.valid = (isnan(rtcm2->ecef.x) == 0) + && (isnan(rtcm2->ecef.y) == 0) && (isnan(rtcm2->ecef.z) == 0); } } else if (strstr(buf, "\"type\":4,") != NULL) { status = json_read_object(buf, json_rtcm4, endptr); if (status == 0) - rtcm2->reference.valid = (isnan(rtcm2->reference.dx)==0)&&(isnan(rtcm2->reference.dy)==0)&&(isnan(rtcm2->reference.dz)==0); + rtcm2->reference.valid = (isnan(rtcm2->reference.dx) == 0) + && (isnan(rtcm2->reference.dy) == 0) + && (isnan(rtcm2->reference.dz) == 0); } else if (strstr(buf, "\"type\":5,") != NULL) { status = json_read_object(buf, json_rtcm5, endptr); if (status == 0) @@ -203,18 +206,18 @@ int json_rtcm2_read(const char *buf, } else { int n; status = json_read_object(buf, json_rtcm2_fallback, endptr); - for (n = 0; n < NITEMS(rtcm2->words); n++) + for (n = 0; n < NITEMS(rtcm2->words); n++) { if (n >= stringcount) { rtcm2->words[n] = 0; } else { unsigned int u; int fldcount = sscanf(stringptrs[n], "0x%08x\n", &u); if (fldcount != 1) - return JSON_ERR_MISC; - else - rtcm2->words[n] = (isgps30bits_t)u; + return JSON_ERR_MISC; + else + rtcm2->words[n] = (isgps30bits_t) u; + } } - } return status; } |