From a7efb030391547d01b4c0bcc5a296404decc75ab Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 12 Oct 2018 14:49:50 +0200 Subject: [PATCH] json: slightly reorder JsonVariant Let's move things around a bit, so that the trailing unused whitespace within the structure due to padding is placed together, so that it is easier to use for new fields. (Found with pahole) --- src/basic/json.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/basic/json.c b/src/basic/json.c index ec2952c6da..b6106498bb 100644 --- a/src/basic/json.c +++ b/src/basic/json.c @@ -45,6 +45,10 @@ struct JsonVariant { JsonVariant *parent; }; + /* If this was parsed from some file or buffer, this stores where from, as well as the source line/column */ + JsonSource *source; + unsigned line, column; + JsonVariantType type:5; /* A marker whether this variant is embedded into in array/object or not. If true, the 'parent' pointer above @@ -59,10 +63,6 @@ struct JsonVariant { /* While comparing two arrays, we use this for marking what we already have seen */ bool is_marked:1; - /* If this was parsed from some file or buffer, this stores where from, as well as the source line/column */ - unsigned line, column; - JsonSource *source; - union { /* For simple types we store the value in-line. */ JsonValue value;