From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 12 Oct 2018 12:49:50 +0000 (+0200)
Subject: json: slightly reorder JsonVariant
X-Git-Tag: v240~473^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a7efb030391547d01b4c0bcc5a296404decc75ab;p=thirdparty%2Fsystemd.git

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)
---

diff --git a/src/basic/json.c b/src/basic/json.c
index ec2952c6da3..b6106498bb7 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;