diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2011-03-14 11:42:43 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2011-03-14 11:42:43 -0400 |
| commit | 23956cd77bda5c81586a2993bdab252b83c6535a (patch) | |
| tree | 2fa8cf6a447ef68d02966531d8101433b8f31d7d /rtcm2_json.c | |
| parent | 88d128afefc8cd94fe48498a6aa0b785f2928285 (diff) | |
| download | gpsd-23956cd77bda5c81586a2993bdab252b83c6535a.tar.gz | |
Change a structure name to avoid a future API break.
All regression tests pass.
Diffstat (limited to 'rtcm2_json.c')
| -rw-r--r-- | rtcm2_json.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/rtcm2_json.c b/rtcm2_json.c index 14d8e3cb..2d85d74f 100644 --- a/rtcm2_json.c +++ b/rtcm2_json.c @@ -49,17 +49,17 @@ int json_rtcm2_read(const char *buf, /*@ -fullinitblock @*/ const struct json_attr_t rtcm1_satellite[] = { - {"ident", t_uinteger, STRUCTOBJECT(struct rangesat_t, ident)}, - {"udre", t_uinteger, STRUCTOBJECT(struct rangesat_t, udre)}, - {"issuedata", t_uinteger, STRUCTOBJECT(struct rangesat_t, issuedata)}, - {"rangerr", t_real, STRUCTOBJECT(struct rangesat_t, rangerr)}, - {"rangerate", t_real, STRUCTOBJECT(struct rangesat_t, rangerate)}, + {"ident", t_uinteger, STRUCTOBJECT(struct gps_rangesat_t, ident)}, + {"udre", t_uinteger, STRUCTOBJECT(struct gps_rangesat_t, udre)}, + {"issuedata", t_uinteger, STRUCTOBJECT(struct gps_rangesat_t, issuedata)}, + {"rangerr", t_real, STRUCTOBJECT(struct gps_rangesat_t, rangerr)}, + {"rangerate", t_real, STRUCTOBJECT(struct gps_rangesat_t, rangerate)}, {NULL}, }; /*@-type@*//* STRUCTARRAY confuses splint */ const struct json_attr_t json_rtcm1[] = { RTCM2_HEADER - {"satellites", t_array, STRUCTARRAY(rtcm2->ranges.sat, + {"satellites", t_array, STRUCTARRAY(rtcm2->gps_ranges.sat, rtcm1_satellite, &satcount)}, {NULL}, }; @@ -197,7 +197,7 @@ int json_rtcm2_read(const char *buf, || strstr(buf, "\"type\":9,") != NULL) { status = json_read_object(buf, json_rtcm1, endptr); if (status == 0) - rtcm2->ranges.nentries = (unsigned)satcount; + rtcm2->gps_ranges.nentries = (unsigned)satcount; } else if (strstr(buf, "\"type\":3,") != NULL) { status = json_read_object(buf, json_rtcm3, endptr); if (status == 0) { |