From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 9 Feb 2021 16:08:06 +0000 (+0100)
Subject: shared/json: make JsonVariant.type field wider
X-Git-Tag: v248-rc1~166^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d24463211cf3643a5c1a0ae4743f555408f49a8;p=thirdparty%2Fsystemd.git

shared/json: make JsonVariant.type field wider

pahole shows that this doesn't make a difference, but we can fit -EINVAL
into .type without warnings.
---

diff --git a/src/shared/json.c b/src/shared/json.c
index fe322129931..b8f8292e74b 100644
--- a/src/shared/json.c
+++ b/src/shared/json.c
@@ -64,7 +64,10 @@ struct JsonVariant {
         JsonSource *source;
         unsigned line, column;
 
-        JsonVariantType type:5;
+        /* The current 'depth' of the JsonVariant, i.e. how many levels of member variants this has */
+        uint16_t depth;
+
+        JsonVariantType type:8;
 
         /* A marker whether this variant is embedded into in array/object or not. If true, the 'parent' pointer above
          * is valid. If false, the 'n_ref' field above is valid instead. */
@@ -87,9 +90,6 @@ struct JsonVariant {
         /* If in addition to this object all objects referenced by it are also ordered strictly by name */
         bool normalized:1;
 
-        /* The current 'depth' of the JsonVariant, i.e. how many levels of member variants this has */
-        uint16_t depth;
-
         union {
                 /* For simple types we store the value in-line. */
                 JsonValue value;