diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2013-11-13 07:15:47 -0500 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2013-11-13 07:15:47 -0500 |
| commit | 37f8f82db8fa029e8362c48ad4d7409f5aa2e048 (patch) | |
| tree | 983fa53874017b49f52c3301b291a2d794d1564a /libgps_json.c | |
| parent | 784724e6428f06d828bba6c1c805e0cea1bdb3cd (diff) | |
| download | gpsd-37f8f82db8fa029e8362c48ad4d7409f5aa2e048.tar.gz | |
In libgps, incorrect defaults resulted in garbage values for empty fields.
Diffstat (limited to 'libgps_json.c')
| -rw-r--r-- | libgps_json.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libgps_json.c b/libgps_json.c index d4b10bf5..8534dea5 100644 --- a/libgps_json.c +++ b/libgps_json.c @@ -268,12 +268,12 @@ static int json_devicelist_read(const char *buf, struct gps_data_t *gpsdata, .len = sizeof(gpsdata->devices.list[0].subtype)}, {"native", t_integer, STRUCTOBJECT(struct devconfig_t, driver_mode), .dflt.integer = -1}, - {"bps", t_integer, STRUCTOBJECT(struct devconfig_t, baudrate), - .dflt.integer = -1}, + {"bps", t_uinteger, STRUCTOBJECT(struct devconfig_t, baudrate), + .dflt.uinteger = DEVDEFAULT_BPS}, {"parity", t_character, STRUCTOBJECT(struct devconfig_t, parity), - .dflt.character = 'N'}, - {"stopbits", t_integer, STRUCTOBJECT(struct devconfig_t, stopbits), - .dflt.integer = -1}, + .dflt.character = DEVDEFAULT_PARITY}, + {"stopbits", t_uinteger, STRUCTOBJECT(struct devconfig_t, stopbits), + .dflt.integer = DEVDEFAULT_STOPBITS}, {"cycle", t_real, STRUCTOBJECT(struct devconfig_t, cycle), .dflt.real = NAN}, {"mincycle", t_real, STRUCTOBJECT(struct devconfig_t, mincycle), |