diff options
author | Gary E. Miller <gem@rellim.com> | 2019-05-17 12:33:23 -0700 |
---|---|---|
committer | Gary E. Miller <gem@rellim.com> | 2019-05-17 12:33:23 -0700 |
commit | b8fb873ad159f1edf64e0aafa499010f2cab831e (patch) | |
tree | 06990a762347544ddf5401c9ade08344a07fdba6 /json.h | |
parent | ef9f2331677beab2e146a56a19161bab979ae3b6 (diff) | |
download | gpsd-b8fb873ad159f1edf64e0aafa499010f2cab831e.tar.gz |
json.h: add ubyte and byte to union addr and union dflt.
No functional change, yet. Also sorted the entries.
Diffstat (limited to 'json.h')
-rw-r--r-- | json.h | 28 |
1 files changed, 16 insertions, 12 deletions
@@ -66,26 +66,30 @@ struct json_attr_t { char *attribute; json_type type; union { - int *integer; - unsigned int *uinteger; - short *shortint; - unsigned short *ushortint; - double *real; - char *string; bool *boolean; + char *byte; char *character; - struct json_array_t array; + char *string; + double *real; + int *integer; + short *shortint; size_t offset; + struct json_array_t array; + unsigned char *ubyte; + unsigned int *uinteger; + unsigned short *ushortint; } addr; union { - int integer; - unsigned int uinteger; - short shortint; - unsigned short ushortint; - double real; bool boolean; + char byte; char character; char *check; + double real; + int integer; + short shortint; + unsigned char ubyte; + unsigned int uinteger; + unsigned short ushortint; } dflt; size_t len; const struct json_enum_t *map; |