From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 20 Mar 2021 17:33:36 +0000 (+0900)
Subject: resolve: drop meaningless bitfield specifier
X-Git-Tag: v249-rc1~499^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e95506a2216729093639f5646bd1003cd16a422;p=thirdparty%2Fsystemd.git

resolve: drop meaningless bitfield specifier

This also rearrange the members to remove holes in the struct.
---

diff --git a/src/resolve/resolved-dns-cache.c b/src/resolve/resolved-dns-cache.c
index c019dc38c9d..b74141e6415 100644
--- a/src/resolve/resolved-dns-cache.c
+++ b/src/resolve/resolved-dns-cache.c
@@ -36,14 +36,13 @@ enum DnsCacheItemType {
 
 struct DnsCacheItem {
         DnsCacheItemType type;
+        int rcode;
         DnsResourceKey *key;     /* The key for this item, i.e. the lookup key */
         DnsResourceRecord *rr;   /* The RR for this item, i.e. the lookup value for positive queries */
         DnsAnswer *answer;       /* The full validated answer, if this is an RRset acquired via a "primary" lookup */
         DnsPacket *full_packet;  /* The full packet this information was acquired with */
-        int rcode;
 
         usec_t until;
-        bool shared_owner:1;
         uint64_t query_flags;    /* SD_RESOLVED_AUTHENTICATED and/or SD_RESOLVED_CONFIDENTIAL */
         DnssecResult dnssec_result;
 
@@ -53,6 +52,8 @@ struct DnsCacheItem {
 
         unsigned prioq_idx;
         LIST_FIELDS(DnsCacheItem, by_key);
+
+        bool shared_owner;
 };
 
 /* Returns true if this is a cache item created as result of an explicit lookup, or created as "side-effect"