diff options
| -rw-r--r-- | json.c | 14 | ||||
| -rw-r--r-- | json.h | 2 | ||||
| -rw-r--r-- | libgps_json.c | 2 |
3 files changed, 9 insertions, 9 deletions
@@ -121,7 +121,7 @@ static /*@null@*/ char *json_target_address(const struct json_attr_t *cursor, case t_uinteger: targetaddr = (char *)&cursor->addr.uinteger[offset]; break; - case t_timestamp: + case t_time: case t_real: targetaddr = (char *)&cursor->addr.real[offset]; break; @@ -199,7 +199,7 @@ static int json_internal_read_object(const char *cp, case t_uinteger: *((unsigned int *)lptr) = cursor->dflt.uinteger; break; - case t_timestamp: + case t_time: case t_real: *((double *)lptr) = cursor->dflt.real; break; @@ -386,7 +386,7 @@ static int json_internal_read_object(const char *cp, */ for (;;) { int seeking = cursor->type; - if (value_quoted && (cursor->type == t_string || cursor->type == t_timestamp)) + if (value_quoted && (cursor->type == t_string || cursor->type == t_time)) break; if ((strcmp(valbuf, "true")==0 || strcmp(valbuf, "false")==0) && seeking == t_boolean) @@ -406,7 +406,7 @@ static int json_internal_read_object(const char *cp, } if (value_quoted && (cursor->type != t_string && cursor->type != t_character - && cursor->type != t_check && cursor->type != t_timestamp + && cursor->type != t_check && cursor->type != t_time && cursor->map == 0)) { json_debug_trace((1, "Saw quoted value when expecting non-string.\n")); @@ -414,7 +414,7 @@ static int json_internal_read_object(const char *cp, } if (!value_quoted && (cursor->type == t_string || cursor->type == t_check - || cursor->type == t_timestamp || cursor->map != 0)) { + || cursor->type == t_time || cursor->map != 0)) { json_debug_trace((1, "Didn't see quoted value when expecting string.\n")); return JSON_ERR_NONQSTRING; @@ -439,7 +439,7 @@ static int json_internal_read_object(const char *cp, case t_uinteger: *((unsigned int *)lptr) = (unsigned)atoi(valbuf); break; - case t_timestamp: + case t_time: *((double *)lptr) = iso8601_to_unix(valbuf); break; case t_real: @@ -562,7 +562,7 @@ int json_read_array(const char *cp, const struct json_array_t *arr, break; case t_integer: case t_uinteger: - case t_timestamp: + case t_time: case t_real: case t_boolean: case t_character: @@ -9,7 +9,7 @@ typedef enum {t_integer, t_uinteger, t_real, t_string, t_boolean, t_character, - t_timestamp, + t_time, t_object, t_structobject, t_array, t_check} json_type; diff --git a/libgps_json.c b/libgps_json.c index c6202b85..b1333fa3 100644 --- a/libgps_json.c +++ b/libgps_json.c @@ -299,7 +299,7 @@ static int json_devicelist_read(const char *buf, struct gps_data_t *gpsdata, {"class", t_check, .dflt.check = "DEVICE"}, {"path", t_string, STRUCTOBJECT(struct devconfig_t, path), .len = sizeof(gpsdata->devices.list[0].path)}, - {"activated", t_timestamp, STRUCTOBJECT(struct devconfig_t, activated)}, + {"activated", t_time, STRUCTOBJECT(struct devconfig_t, activated)}, {"activated", t_real, STRUCTOBJECT(struct devconfig_t, activated)}, {"flags", t_integer, STRUCTOBJECT(struct devconfig_t, flags)}, {"driver", t_string, STRUCTOBJECT(struct devconfig_t, driver), |