diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2009-08-27 12:58:25 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2009-08-27 12:58:25 +0000 |
| commit | 8e2e2899446ea21d82eb822c5734d04e756b7184 (patch) | |
| tree | 78830bac1a0b6df41d9baa4c07055452c3d867a6 /rtcm2_json.c | |
| parent | ccc3c5d85f1fabc99e3d4acd43fa5b9da8602cdf (diff) | |
| download | gpsd-8e2e2899446ea21d82eb822c5734d04e756b7184.tar.gz | |
Use STRUCTARRAY everywhere it's apprpriate. JSON regression tests pass.
Diffstat (limited to 'rtcm2_json.c')
| -rw-r--r-- | rtcm2_json.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/rtcm2_json.c b/rtcm2_json.c index 912ca1a7..f8c9b6e2 100644 --- a/rtcm2_json.c +++ b/rtcm2_json.c @@ -41,16 +41,16 @@ int json_rtcm2_read(const char *buf, int status, satcount; const struct json_attr_t rtcm1_satellite[] = { - {"ident", STRUCTOBJECT(uinteger, struct rangesat_t, ident)}, - {"udre", STRUCTOBJECT(uinteger, struct rangesat_t, udre)}, - {"issuedata", STRUCTOBJECT(real, struct rangesat_t, issuedata)}, - {"rangerr", STRUCTOBJECT(real, struct rangesat_t, rangerr)}, - {"rangerate", STRUCTOBJECT(real, struct rangesat_t, rangerate)}, + {"ident", uinteger, STRUCTOBJECT(struct rangesat_t, ident)}, + {"udre", uinteger, STRUCTOBJECT(struct rangesat_t, udre)}, + {"issuedata", real, STRUCTOBJECT(struct rangesat_t, issuedata)}, + {"rangerr", real, STRUCTOBJECT(struct rangesat_t, rangerr)}, + {"rangerate", real, STRUCTOBJECT(struct rangesat_t, rangerate)}, {NULL}, }; const struct json_attr_t json_rtcm1[] = { RTCM2_HEADER - {"satellites", STRUCTARRAY(rtcm2->ranges.sat, + {"satellites", array, STRUCTARRAY(rtcm2->ranges.sat, rtcm1_satellite, &satcount)}, {NULL}, }; |