diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2010-01-04 23:28:43 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2010-01-04 23:28:43 +0000 |
| commit | ff47beb08f85a781ad3224b072ee0234ad09c4ae (patch) | |
| tree | 4102bc79cc0cc7263c29e8b5282b0f0f39920eb6 /gpsd_json.c | |
| parent | 89728c22f258e05d37d1dea4af1fb1b2ee5f5711 (diff) | |
| download | gpsd-ff47beb08f85a781ad3224b072ee0234ad09c4ae.tar.gz | |
Avoid a collision with typedef boolean.
All regression tests pass.
Diffstat (limited to 'gpsd_json.c')
| -rw-r--r-- | gpsd_json.c | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/gpsd_json.c b/gpsd_json.c index 0cb80774..a1141d90 100644 --- a/gpsd_json.c +++ b/gpsd_json.c @@ -1305,28 +1305,28 @@ int json_device_read(const char *buf, { /*@ -fullinitblock @*/ const struct json_attr_t json_attrs_device[] = { - {"class", check, .dflt.check = "DEVICE"}, + {"class", t_check, .dflt.check = "DEVICE"}, - {"path", string, .addr.string = dev->path, - .len = sizeof(dev->path)}, - {"activated", real, .addr.real = &dev->activated}, - {"flags", integer, .addr.integer = &dev->flags}, - {"driver", string, .addr.string = dev->driver, - .len = sizeof(dev->driver)}, - {"subtype", string, .addr.string = dev->subtype, - .len = sizeof(dev->subtype)}, - {"native", integer, .addr.integer = &dev->driver_mode, - .dflt.integer = DEVDEFAULT_NATIVE}, - {"bps", uinteger, .addr.uinteger = &dev->baudrate, - .dflt.uinteger = DEVDEFAULT_BPS}, - {"parity", character, .addr.character = &dev->parity, - .dflt.character = DEVDEFAULT_PARITY}, - {"stopbits", uinteger, .addr.uinteger = &dev->stopbits, - .dflt.uinteger = DEVDEFAULT_STOPBITS}, - {"cycle", real, .addr.real = &dev->cycle, - .dflt.real = NAN}, - {"mincycle", real, .addr.real = &dev->mincycle, - .dflt.real = NAN}, + {"path", t_string, .addr.string = dev->path, + .len = sizeof(dev->path)}, + {"activated", t_real, .addr.real = &dev->activated}, + {"flags", t_integer, .addr.integer = &dev->flags}, + {"driver", t_string, .addr.string = dev->driver, + .len = sizeof(dev->driver)}, + {"subtype", t_string, .addr.string = dev->subtype, + .len = sizeof(dev->subtype)}, + {"native", t_integer, .addr.integer = &dev->driver_mode, + .dflt.integer = DEVDEFAULT_NATIVE}, + {"bps", t_uinteger, .addr.uinteger = &dev->baudrate, + .dflt.uinteger = DEVDEFAULT_BPS}, + {"parity", t_character, .addr.character = &dev->parity, + .dflt.character = DEVDEFAULT_PARITY}, + {"stopbits", t_uinteger, .addr.uinteger = &dev->stopbits, + .dflt.uinteger = DEVDEFAULT_STOPBITS}, + {"cycle", t_real, .addr.real = &dev->cycle, + .dflt.real = NAN}, + {"mincycle", t_real, .addr.real = &dev->mincycle, + .dflt.real = NAN}, {NULL}, }; /*@ +fullinitblock @*/ @@ -1345,20 +1345,20 @@ int json_watch_read(const char *buf, { /*@ -fullinitblock @*/ struct json_attr_t chanconfig_attrs[] = { - {"class", check, .dflt.check = "WATCH"}, + {"class", t_check, .dflt.check = "WATCH"}, - {"enable", boolean, .addr.boolean = &ccp->watcher, - .dflt.boolean = true}, - {"json", boolean, .addr.boolean = &ccp->json, - .nodefault = true}, - {"raw", integer, .addr.integer = &ccp->raw, - .nodefault = true}, - {"nmea", boolean, .addr.boolean = &ccp->nmea, - .nodefault = true}, - {"scaled", boolean, .addr.boolean = &ccp->scaled}, - {"timing", boolean, .addr.boolean = &ccp->timing}, - {"device", string, .addr.string = ccp->devpath, - .len = sizeof(ccp->devpath)}, + {"enable", t_boolean, .addr.boolean = &ccp->watcher, + .dflt.boolean = true}, + {"json", t_boolean, .addr.boolean = &ccp->json, + .nodefault = true}, + {"raw", t_integer, .addr.integer = &ccp->raw, + .nodefault = true}, + {"nmea", t_boolean, .addr.boolean = &ccp->nmea, + .nodefault = true}, + {"scaled", t_boolean, .addr.boolean = &ccp->scaled}, + {"timing", t_boolean, .addr.boolean = &ccp->timing}, + {"device", t_string, .addr.string = ccp->devpath, + .len = sizeof(ccp->devpath)}, {NULL}, }; /*@ +fullinitblock @*/ |