Avoid a collision with typedef boolean.

All regression tests pass.

1 files changed, 97 insertions, 97 deletions

diff --git a/libgps_json.c b/libgps_json.c
index 8e42b0ed..6f37d616 100644
--- a/libgps_json.c
+++ b/libgps_json.c
@@ -33,41 +33,41 @@ static int json_tpv_read(const char *buf,
     int status;
     /*@ -fullinitblock @*/
     const struct json_attr_t json_attrs_1[] = {
-	{"class",  check,   .dflt.check = "TPV"},
-	{"device", string,  .addr.string = gpsdata->dev.path,
-			    .len = sizeof(gpsdata->dev.path)},
-	{"tag",    string,  .addr.string = gpsdata->tag,
-			    .len = sizeof(gpsdata->tag)},
-	{"time",   real,    .addr.real = &gpsdata->fix.time,
-			    .dflt.real = NAN},
-	{"ept",    real,    .addr.real = &gpsdata->fix.ept,
-			    .dflt.real = NAN},
-	{"lon",    real,    .addr.real = &gpsdata->fix.longitude,
-			    .dflt.real = NAN},
-	{"lat",    real,    .addr.real = &gpsdata->fix.latitude,
-			    .dflt.real = NAN},
-	{"alt",    real,    .addr.real = &gpsdata->fix.altitude,
-			    .dflt.real = NAN},
-	{"epx",    real,    .addr.real = &gpsdata->fix.epx,
-			    .dflt.real = NAN},
-	{"epy",    real,    .addr.real = &gpsdata->fix.epy,
-			    .dflt.real = NAN},
-	{"epv",    real,    .addr.real = &gpsdata->fix.epv,
-			    .dflt.real = NAN},
-	{"track",   real,   .addr.real = &gpsdata->fix.track,
-			    .dflt.real = NAN},
-	{"speed",   real,   .addr.real = &gpsdata->fix.speed,
-			    .dflt.real = NAN},
-	{"climb",   real,   .addr.real = &gpsdata->fix.climb,
-			    .dflt.real = NAN},
-	{"epd",    real,    .addr.real = &gpsdata->fix.epd,
-			    .dflt.real = NAN},
-	{"eps",    real,    .addr.real = &gpsdata->fix.eps,
-			    .dflt.real = NAN},
-	{"epc",    real,    .addr.real = &gpsdata->fix.epc,
-			    .dflt.real = NAN},
-	{"mode",   integer, .addr.integer = &gpsdata->fix.mode,
-			    .dflt.integer = MODE_NOT_SEEN},
+	{"class",  t_check,   .dflt.check = "TPV"},
+	{"device", t_string,  .addr.string = gpsdata->dev.path,
+			         .len = sizeof(gpsdata->dev.path)},
+	{"tag",    t_string,  .addr.string = gpsdata->tag,
+			         .len = sizeof(gpsdata->tag)},
+	{"time",   t_real,    .addr.real = &gpsdata->fix.time,
+			         .dflt.real = NAN},
+	{"ept",    t_real,    .addr.real = &gpsdata->fix.ept,
+			         .dflt.real = NAN},
+	{"lon",    t_real,    .addr.real = &gpsdata->fix.longitude,
+			         .dflt.real = NAN},
+	{"lat",    t_real,    .addr.real = &gpsdata->fix.latitude,
+			         .dflt.real = NAN},
+	{"alt",    t_real,    .addr.real = &gpsdata->fix.altitude,
+			         .dflt.real = NAN},
+	{"epx",    t_real,    .addr.real = &gpsdata->fix.epx,
+			         .dflt.real = NAN},
+	{"epy",    t_real,    .addr.real = &gpsdata->fix.epy,
+			         .dflt.real = NAN},
+	{"epv",    t_real,    .addr.real = &gpsdata->fix.epv,
+			         .dflt.real = NAN},
+	{"track",   t_real,   .addr.real = &gpsdata->fix.track,
+			         .dflt.real = NAN},
+	{"speed",   t_real,   .addr.real = &gpsdata->fix.speed,
+			         .dflt.real = NAN},
+	{"climb",   t_real,   .addr.real = &gpsdata->fix.climb,
+			         .dflt.real = NAN},
+	{"epd",    t_real,    .addr.real = &gpsdata->fix.epd,
+			         .dflt.real = NAN},
+	{"eps",    t_real,    .addr.real = &gpsdata->fix.eps,
+			         .dflt.real = NAN},
+	{"epc",    t_real,    .addr.real = &gpsdata->fix.epc,
+			         .dflt.real = NAN},
+	{"mode",   t_integer, .addr.integer = &gpsdata->fix.mode,
+			         .dflt.integer = MODE_NOT_SEEN},
 	{NULL},
     };
     /*@ +fullinitblock @*/
@@ -116,38 +116,38 @@ static int json_sky_read(const char *buf,
     bool usedflags[MAXCHANNELS];
     /*@ -fullinitblock @*/
     const struct json_attr_t json_attrs_2_1[] = {
-	{"PRN",	   integer, .addr.integer = gpsdata->PRN},
-	{"el",	   integer, .addr.integer = gpsdata->elevation},
-	{"az",	   integer, .addr.integer = gpsdata->azimuth},
-	{"ss",	   real,    .addr.real = gpsdata->ss},
-	{"used",   boolean, .addr.boolean = usedflags},
+	{"PRN",	   t_integer, .addr.integer = gpsdata->PRN},
+	{"el",	   t_integer, .addr.integer = gpsdata->elevation},
+	{"az",	   t_integer, .addr.integer = gpsdata->azimuth},
+	{"ss",	   t_real,    .addr.real = gpsdata->ss},
+	{"used",   t_boolean, .addr.boolean = usedflags},
 	{NULL},
     };
     const struct json_attr_t json_attrs_2[] = {
-	{"class",      check,   .dflt.check = "SKY"},
-	{"device",     string,  .addr.string  = gpsdata->dev.path,
-	                        .len = sizeof(gpsdata->dev.path)},
-	{"tag",	       string,  .addr.string  = gpsdata->tag,
-	                        .len = sizeof(gpsdata->tag)},
-	{"time",       real,    .addr.real    = &gpsdata->fix.time},
-	{"hdop",       real,    .addr.real    = &gpsdata->dop.hdop,
-	                        .dflt.real = NAN},
-	{"xdop",       real,    .addr.real    = &gpsdata->dop.xdop,
-	                        .dflt.real = NAN},
-	{"ydop",       real,    .addr.real    = &gpsdata->dop.ydop,
-	                        .dflt.real = NAN},
-	{"vdop",       real,    .addr.real    = &gpsdata->dop.vdop,
-	                        .dflt.real = NAN},
-	{"tdop",       real,    .addr.real    = &gpsdata->dop.tdop,
-	                        .dflt.real = NAN},
-	{"pdop",       real,    .addr.real    = &gpsdata->dop.pdop,
-	                        .dflt.real = NAN},
-	{"gdop",       real,    .addr.real    = &gpsdata->dop.gdop,
-	                        .dflt.real = NAN},
-	{"satellites", array,   .addr.array.element_type = object,
-				.addr.array.arr.objects.subtype=json_attrs_2_1,
-	                        .addr.array.maxlen = MAXCHANNELS,
-	                        .addr.array.count = &gpsdata->satellites_visible},
+	{"class",      t_check,   .dflt.check = "SKY"},
+	{"device",     t_string,  .addr.string  = gpsdata->dev.path,
+	                             .len = sizeof(gpsdata->dev.path)},
+	{"tag",	       t_string,  .addr.string  = gpsdata->tag,
+	                             .len = sizeof(gpsdata->tag)},
+	{"time",       t_real,    .addr.real    = &gpsdata->fix.time},
+	{"hdop",       t_real,    .addr.real    = &gpsdata->dop.hdop,
+	                             .dflt.real = NAN},
+	{"xdop",       t_real,    .addr.real    = &gpsdata->dop.xdop,
+	                             .dflt.real = NAN},
+	{"ydop",       t_real,    .addr.real    = &gpsdata->dop.ydop,
+	                             .dflt.real = NAN},
+	{"vdop",       t_real,    .addr.real    = &gpsdata->dop.vdop,
+	                             .dflt.real = NAN},
+	{"tdop",       t_real,    .addr.real    = &gpsdata->dop.tdop,
+	                             .dflt.real = NAN},
+	{"pdop",       t_real,    .addr.real    = &gpsdata->dop.pdop,
+	                             .dflt.real = NAN},
+	{"gdop",       t_real,    .addr.real    = &gpsdata->dop.gdop,
+	                             .dflt.real = NAN},
+	{"satellites", t_array,   .addr.array.element_type = t_object,
+				     .addr.array.arr.objects.subtype=json_attrs_2_1,
+	                             .addr.array.maxlen = MAXCHANNELS,
+	                             .addr.array.count = &gpsdata->satellites_visible},
 	{NULL},
     };
     /*@ +fullinitblock @*/
@@ -178,33 +178,33 @@ static int json_devicelist_read(const char *buf,
 {
     /*@ -fullinitblock @*/
     const struct json_attr_t json_attrs_subdevices[] = {
-	{"class",      check,      .dflt.check = "DEVICE"},
-	{"path",       string,     STRUCTOBJECT(struct devconfig_t, path),
-	                           .len = sizeof(gpsdata->devices.list[0].path)},
-	{"activated",  real,       STRUCTOBJECT(struct devconfig_t, activated)},
-	{"flags",      integer,	   STRUCTOBJECT(struct devconfig_t, flags)},
-	{"driver",     string,     STRUCTOBJECT(struct devconfig_t, driver),
-	                           .len = sizeof(gpsdata->devices.list[0].driver)},
-	{"subtype",    string,     STRUCTOBJECT(struct devconfig_t, subtype),
-	                           .len = sizeof(gpsdata->devices.list[0].subtype)},
-	{"native",     integer,    STRUCTOBJECT(struct devconfig_t, driver_mode),
-				   .dflt.integer = -1},
-	{"bps",	       integer,    STRUCTOBJECT(struct devconfig_t, baudrate),
-				   .dflt.integer = -1},
-	{"parity",     character,  STRUCTOBJECT(struct devconfig_t, parity),
-	                           .dflt.character = 'N'},
-	{"stopbits",   integer,    STRUCTOBJECT(struct devconfig_t, stopbits),
-				   .dflt.integer = -1},
-	{"cycle",      real,       STRUCTOBJECT(struct devconfig_t, cycle),
-				   .dflt.real = NAN},
-	{"mincycle",   real,       STRUCTOBJECT(struct devconfig_t, mincycle),
-				   .dflt.real = NAN},
+	{"class",      t_check,      .dflt.check = "DEVICE"},
+	{"path",       t_string,     STRUCTOBJECT(struct devconfig_t, path),
+	                                .len = sizeof(gpsdata->devices.list[0].path)},
+	{"activated",  t_real,       STRUCTOBJECT(struct devconfig_t, activated)},
+	{"flags",      t_integer,	   STRUCTOBJECT(struct devconfig_t, flags)},
+	{"driver",     t_string,     STRUCTOBJECT(struct devconfig_t, driver),
+	                                .len = sizeof(gpsdata->devices.list[0].driver)},
+	{"subtype",    t_string,     STRUCTOBJECT(struct devconfig_t, subtype),
+	                                .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},
+	{"parity",     t_character,  STRUCTOBJECT(struct devconfig_t, parity),
+	                                .dflt.character = 'N'},
+	{"stopbits",   t_integer,    STRUCTOBJECT(struct devconfig_t, stopbits),
+				        .dflt.integer = -1},
+	{"cycle",      t_real,       STRUCTOBJECT(struct devconfig_t, cycle),
+				        .dflt.real = NAN},
+	{"mincycle",   t_real,       STRUCTOBJECT(struct devconfig_t, mincycle),
+				        .dflt.real = NAN},
 	{NULL},
     };
     /*@-type@*//* STRUCTARRAY confuses splint */
     const struct json_attr_t json_attrs_devices[] = {
-        {"class",   check,  .dflt.check = "DEVICES"},
-        {"devices", array,  STRUCTARRAY(gpsdata->devices.list,
+        {"class",   t_check,  .dflt.check = "DEVICES"},
+        {"devices", t_array,  STRUCTARRAY(gpsdata->devices.list,
 					json_attrs_subdevices,
 					&gpsdata->devices.ndevices)},
 	{NULL},
@@ -231,13 +231,13 @@ static int json_version_read(const char *buf,
 {
     /*@ -fullinitblock @*/
     const struct json_attr_t json_attrs_version[] = {
-        {"class",     check,   .dflt.check = "VERSION"},
-	{"release",   string,  .addr.string  = gpsdata->version.release,
-	                       .len = sizeof(gpsdata->version.release)},
-	{"rev",       string,  .addr.string  = gpsdata->version.rev,
-	                       .len = sizeof(gpsdata->version.rev)},
-	{"proto_major", integer, .addr.integer = &gpsdata->version.proto_major},
-	{"proto_minor", integer, .addr.integer = &gpsdata->version.proto_minor},
+        {"class",     t_check,   .dflt.check = "VERSION"},
+	{"release",   t_string,  .addr.string  = gpsdata->version.release,
+	                            .len = sizeof(gpsdata->version.release)},
+	{"rev",       t_string,  .addr.string  = gpsdata->version.rev,
+	                            .len = sizeof(gpsdata->version.rev)},
+	{"proto_major", t_integer, .addr.integer = &gpsdata->version.proto_major},
+	{"proto_minor", t_integer, .addr.integer = &gpsdata->version.proto_minor},
 	{NULL},
     };
     /*@ +fullinitblock @*/
@@ -259,9 +259,9 @@ static int json_error_read(const char *buf,
 {
     /*@ -fullinitblock @*/
     const struct json_attr_t json_attrs_error[] = {
-        {"class",     check,   .dflt.check = "ERROR"},
-	{"message",   string,  .addr.string  = gpsdata->error,
-	                       .len = sizeof(gpsdata->error)},
+        {"class",     t_check,   .dflt.check = "ERROR"},
+	{"message",   t_string,  .addr.string  = gpsdata->error,
+	                            .len = sizeof(gpsdata->error)},
 	{NULL},
     };
     /*@ +fullinitblock @*/