resolved: make use of union in_addr_union in resolved, too

diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index 0e2b85b5a9201dd8e684e390eb4b3cb1a6526dc4..9d073c725cdf23a336b559d635588201b2fb836d 100644 (file)
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -114,6 +114,8 @@ int manager_new(Manager **ret) {
         _cleanup_manager_free_ Manager *m = NULL;
         int r;
 
         _cleanup_manager_free_ Manager *m = NULL;
         int r;
 

+        assert(ret);
+

         m = new0(Manager, 1);
         if (!m)
                 return -ENOMEM;
         m = new0(Manager, 1);
         if (!m)
                 return -ENOMEM;

diff --git a/src/resolve/resolved.h b/src/resolve/resolved.h
index 984edc76c1c6f0e07d724d38c57d3e45a565cad7..48b361db5733269c2babdac99ad10f97f2bb6531 100644 (file)
--- a/src/resolve/resolved.h
+++ b/src/resolve/resolved.h
@@ -26,6 +26,7 @@
 
 #include "util.h"
 #include "list.h"
 
 #include "util.h"
 #include "list.h"

+#include "socket-util.h"

 
 typedef struct Address Address;
 typedef struct Manager Manager;
 
 typedef struct Address Address;
 typedef struct Manager Manager;


@@ -33,10 +34,7 @@ typedef struct Manager Manager;
 struct Address {
         unsigned char family;
 
 struct Address {
         unsigned char family;
 

-        union {
-                struct in_addr in;
-                struct in6_addr in6;
-        } in_addr;
+        union in_addr_union in_addr;

 
         LIST_FIELDS(Address, addresses);
 };
 
         LIST_FIELDS(Address, addresses);
 };

diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c
index 27f6b2d22628e33172f53ebcf0b7044c75484245..0c50902d1d0886321601dc2d75c2816517d90c6f 100644 (file)
--- a/src/timesync/timesyncd.c
+++ b/src/timesync/timesyncd.c
@@ -1019,6 +1019,8 @@ static int manager_new(Manager **ret) {
         _cleanup_manager_free_ Manager *m = NULL;
         int r;
 
         _cleanup_manager_free_ Manager *m = NULL;
         int r;
 

+        assert(ret);
+

         m = new0(Manager, 1);
         if (!m)
                 return -ENOMEM;
         m = new0(Manager, 1);
         if (!m)
                 return -ENOMEM;