diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2009-08-23 13:12:10 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2009-08-23 13:12:10 +0000 |
| commit | 6b070fe325b731a967f8ace8dc2b5d2786676014 (patch) | |
| tree | 252cf17959eb80572d6088ed7d67f9ce6d647005 /libgps_json.c | |
| parent | 894add2589562cf783f444ca7e83943045ffae43 (diff) | |
| download | gpsd-6b070fe325b731a967f8ace8dc2b5d2786676014.tar.gz | |
Major rearrangement of device members in struct gpsdata_t...
...documented in the protocol-transition white paper. All regression
tests pass.
Diffstat (limited to 'libgps_json.c')
| -rw-r--r-- | libgps_json.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libgps_json.c b/libgps_json.c index b6960ce0..ec5b76ed 100644 --- a/libgps_json.c +++ b/libgps_json.c @@ -25,8 +25,8 @@ static int json_tpv_read(const char *buf, int status; const struct json_attr_t json_attrs_1[] = { {"class", check, .dflt.check = "TPV"}, - {"device", string, .addr.string.ptr = gpsdata->gps_device, - .addr.string.len = sizeof(gpsdata->gps_device)}, + {"device", string, .addr.string.ptr = gpsdata->dev.path, + .addr.string.len = sizeof(gpsdata->dev.path)}, {"tag", string, .addr.string.ptr = gpsdata->tag, .addr.string.len = sizeof(gpsdata->tag)}, {"time", real, .addr.real = &gpsdata->fix.time, @@ -111,7 +111,7 @@ static int json_sky_read(const char *buf, }; const struct json_attr_t json_attrs_2[] = { {"class", check, .dflt.check = "SKY"}, - {"device", string, .addr.string.ptr = gpsdata->gps_device, + {"device", string, .addr.string.ptr = gpsdata->dev.path, .addr.string.len = PATH_MAX}, {"tag", string, .addr.string.ptr = gpsdata->tag, .addr.string.len = MAXTAGLEN}, @@ -146,7 +146,8 @@ static int json_device_read(const char *buf, { const struct json_attr_t json_attrs_device[] = { {"class", check, .dflt.check = "DEVICE"}, - {"path", string, .addr.string.ptr = dev->path, + + {"path", string, .addr.string.ptr = dev->path, .addr.string.len = sizeof(dev->path)}, {"activated", real, .addr.real = &dev->activated}, {"flags", integer, .addr.integer = &dev->flags}, |