From b8fb873ad159f1edf64e0aafa499010f2cab831e Mon Sep 17 00:00:00 2001 From: "Gary E. Miller" Date: Fri, 17 May 2019 12:33:23 -0700 Subject: json.h: add ubyte and byte to union addr and union dflt. No functional change, yet. Also sorted the entries. --- json.h | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/json.h b/json.h index 19682e47..55f3c2ce 100644 --- a/json.h +++ b/json.h @@ -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; -- cgit v1.2.1