resolved: put /etc/hosts hashmaps in a structure and pass that around

This hides the details of juggling the two hashmaps from the callers a bit.
It also makes memory management a bit easier, because those two hashmaps share
some strings, so we can only free them together.

etc_hosts_parse() is made responsible to free the half-filled data structures
on error, which makes the caller a bit simpler.

No functional change. A refactoring to prepare for later changes.

1 files changed, 6 insertions, 2 deletions

diff --git a/src/resolve/resolved-manager.h b/src/resolve/resolved-manager.h
index 798040378e..c9cf2f0ee6 100644
--- a/src/resolve/resolved-manager.h
+++ b/src/resolve/resolved-manager.h
@@ -23,6 +23,11 @@ typedef struct Manager Manager;
 #define MANAGER_SEARCH_DOMAINS_MAX 32
 #define MANAGER_DNS_SERVERS_MAX 32
 
+typedef struct EtcHosts {
+        Hashmap *by_address;
+        Hashmap *by_name;
+} EtcHosts;
+
 struct Manager {
         sd_event *event;
 
@@ -114,8 +119,7 @@ struct Manager {
         unsigned n_dnssec_verdict[_DNSSEC_VERDICT_MAX];
 
         /* Data from /etc/hosts */
-        Hashmap* etc_hosts_by_address;
-        Hashmap* etc_hosts_by_name;
+        EtcHosts etc_hosts;
         usec_t etc_hosts_last, etc_hosts_mtime;
         bool read_etc_hosts;