Merge pull request #1691 from poettering/util-lib-3

split up util.h and macro.h into even more bits

23 files changed, 53 insertions, 17 deletions

diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index acb6b7ce24..97c1fe6560 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -28,15 +28,20 @@
 #include "sd-netlink.h"
 #include "sd-network.h"
 
+#include "alloc-util.h"
 #include "arphrd-list.h"
 #include "device-util.h"
 #include "ether-addr-util.h"
 #include "hwdb-util.h"
 #include "lldp.h"
 #include "local-addresses.h"
+#include "locale-util.h"
+#include "locale-util.h"
 #include "netlink-util.h"
 #include "pager.h"
+#include "parse-util.h"
 #include "socket-util.h"
+#include "string-table.h"
 #include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"
diff --git a/src/network/networkd-address-pool.c b/src/network/networkd-address-pool.c
index 08e0b9a64b..889fe1e30d 100644
--- a/src/network/networkd-address-pool.c
+++ b/src/network/networkd-address-pool.c
@@ -19,6 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "alloc-util.h"
 #include "networkd-address-pool.h"
 #include "networkd.h"
 #include "set.h"
diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index dcd7b482d3..e550ee5701 100644
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -21,15 +21,17 @@
 
 #include <net/if.h>
 
+#include "alloc-util.h"
 #include "conf-parser.h"
 #include "firewall-util.h"
 #include "netlink-util.h"
+#include "networkd-address.h"
 #include "networkd.h"
+#include "parse-util.h"
 #include "set.h"
 #include "string-util.h"
 #include "utf8.h"
 #include "util.h"
-#include "networkd-address.h"
 
 int address_new(Address **ret) {
         _cleanup_address_free_ Address *address = NULL;
diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
index 22594a9415..c412a2cc31 100644
--- a/src/network/networkd-dhcp4.c
+++ b/src/network/networkd-dhcp4.c
@@ -22,10 +22,11 @@
 #include <netinet/ether.h>
 #include <linux/if.h>
 
+#include "alloc-util.h"
+#include "dhcp-lease-internal.h"
 #include "hostname-util.h"
-#include "networkd-link.h"
 #include "network-internal.h"
-#include "dhcp-lease-internal.h"
+#include "networkd-link.h"
 
 static int dhcp4_route_handler(sd_netlink *rtnl, sd_netlink_message *m,
                                void *userdata) {
diff --git a/src/network/networkd-fdb.c b/src/network/networkd-fdb.c
index 9cb63cb79f..c9222b8cb8 100644
--- a/src/network/networkd-fdb.c
+++ b/src/network/networkd-fdb.c
@@ -22,12 +22,12 @@
 #include <net/if.h>
 #include <net/ethernet.h>
 
+#include "alloc-util.h"
 #include "conf-parser.h"
-#include "util.h"
 #include "netlink-util.h"
-
-#include "networkd.h"
 #include "networkd-fdb.h"
+#include "networkd.h"
+#include "util.h"
 
 /* create a new FDB entry or get an existing one. */
 int fdb_entry_new_static(Network *const network,
diff --git a/src/network/networkd-link-bus.c b/src/network/networkd-link-bus.c
index 1a1524dfb4..7fc4510ac9 100644
--- a/src/network/networkd-link-bus.c
+++ b/src/network/networkd-link-bus.c
@@ -22,8 +22,10 @@
 #include "bus-util.h"
 #include "strv.h"
 
-#include "networkd.h"
+#include "alloc-util.h"
 #include "networkd-link.h"
+#include "networkd.h"
+#include "parse-util.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_operational_state, link_operstate, LinkOperationalState);
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_administrative_state, link_state, LinkState);
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 1144c82c17..dcc2569660 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -23,6 +23,7 @@
 #include <linux/if.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "bus-util.h"
 #include "dhcp-lease-internal.h"
 #include "fd-util.h"
@@ -33,6 +34,8 @@
 #include "networkd-netdev.h"
 #include "set.h"
 #include "socket-util.h"
+#include "stdio-util.h"
+#include "string-table.h"
 #include "udev-util.h"
 #include "util.h"
 #include "virt.h"
diff --git a/src/network/networkd-manager-bus.c b/src/network/networkd-manager-bus.c
index b281f4fdb6..dafaf2daea 100644
--- a/src/network/networkd-manager-bus.c
+++ b/src/network/networkd-manager-bus.c
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "alloc-util.h"
 #include "bus-util.h"
-
 #include "networkd.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_operational_state, link_operstate, LinkOperationalState);
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index febfe2ff81..6b2a661ca7 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -25,10 +25,12 @@
 #include "sd-daemon.h"
 #include "sd-netlink.h"
 
+#include "alloc-util.h"
 #include "bus-util.h"
 #include "conf-parser.h"
 #include "def.h"
 #include "fd-util.h"
+#include "fileio.h"
 #include "libudev-private.h"
 #include "local-addresses.h"
 #include "netlink-util.h"
diff --git a/src/network/networkd-netdev-bond.c b/src/network/networkd-netdev-bond.c
index afc1efdcf7..70105b8aa0 100644
--- a/src/network/networkd-netdev-bond.c
+++ b/src/network/networkd-netdev-bond.c
@@ -25,10 +25,12 @@
 
 #include "sd-netlink.h"
 
+#include "alloc-util.h"
 #include "conf-parser.h"
 #include "missing.h"
-#include "string-util.h"
 #include "networkd-netdev-bond.h"
+#include "string-util.h"
+#include "string-table.h"
 
 /*
  * Number of seconds between instances where the bonding
diff --git a/src/network/networkd-netdev-ipvlan.c b/src/network/networkd-netdev-ipvlan.c
index fb0aed0dcb..27cb7d1bf0 100644
--- a/src/network/networkd-netdev-ipvlan.c
+++ b/src/network/networkd-netdev-ipvlan.c
@@ -21,8 +21,9 @@
 
 #include <net/if.h>
 
-#include "networkd-netdev-ipvlan.h"
 #include "conf-parser.h"
+#include "networkd-netdev-ipvlan.h"
+#include "string-table.h"
 
 static const char* const ipvlan_mode_table[_NETDEV_IPVLAN_MODE_MAX] = {
         [NETDEV_IPVLAN_MODE_L2] = "L2",
diff --git a/src/network/networkd-netdev-macvlan.c b/src/network/networkd-netdev-macvlan.c
index e17de793ce..7144823b2d 100644
--- a/src/network/networkd-netdev-macvlan.c
+++ b/src/network/networkd-netdev-macvlan.c
@@ -21,8 +21,9 @@
 
 #include <net/if.h>
 
-#include "networkd-netdev-macvlan.h"
 #include "conf-parser.h"
+#include "networkd-netdev-macvlan.h"
+#include "string-table.h"
 
 static const char* const macvlan_mode_table[_NETDEV_MACVLAN_MODE_MAX] = {
         [NETDEV_MACVLAN_MODE_PRIVATE] = "private",
diff --git a/src/network/networkd-netdev-tunnel.c b/src/network/networkd-netdev-tunnel.c
index bbc4606258..385338849f 100644
--- a/src/network/networkd-netdev-tunnel.c
+++ b/src/network/networkd-netdev-tunnel.c
@@ -30,9 +30,11 @@
 #include "conf-parser.h"
 #include "missing.h"
 #include "networkd-link.h"
+#include "networkd-netdev-tunnel.h"
+#include "parse-util.h"
+#include "string-table.h"
 #include "string-util.h"
 #include "util.h"
-#include "networkd-netdev-tunnel.h"
 
 #define DEFAULT_TNL_HOP_LIMIT   64
 #define IP6_FLOWINFO_FLOWLABEL  htonl(0x000FFFFF)
diff --git a/src/network/networkd-netdev-tuntap.c b/src/network/networkd-netdev-tuntap.c
index d04bb9bd9f..851e83537e 100644
--- a/src/network/networkd-netdev-tuntap.c
+++ b/src/network/networkd-netdev-tuntap.c
@@ -23,6 +23,7 @@
 #include <net/if.h>
 #include <linux/if_tun.h>
 
+#include "alloc-util.h"
 #include "fd-util.h"
 #include "networkd-netdev-tuntap.h"
 #include "user-util.h"
diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c
index bd1129a09b..dd0b400c6a 100644
--- a/src/network/networkd-netdev.c
+++ b/src/network/networkd-netdev.c
@@ -21,6 +21,7 @@
 
 #include <net/if.h>
 
+#include "alloc-util.h"
 #include "conf-files.h"
 #include "conf-parser.h"
 #include "fd-util.h"
@@ -30,6 +31,8 @@
 #include "networkd-netdev.h"
 #include "networkd.h"
 #include "siphash24.h"
+#include "stat-util.h"
+#include "string-table.h"
 #include "string-util.h"
 
 const NetDevVTable * const netdev_vtable[_NETDEV_KIND_MAX] = {
diff --git a/src/network/networkd-network-bus.c b/src/network/networkd-network-bus.c
index 2199b93baa..120760a986 100644
--- a/src/network/networkd-network-bus.c
+++ b/src/network/networkd-network-bus.c
@@ -19,6 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "alloc-util.h"
 #include "networkd.h"
 #include "string-util.h"
 #include "strv.h"
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 150fd052c2..cc8d019017 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -22,6 +22,7 @@
 #include <ctype.h>
 #include <net/if.h>
 
+#include "alloc-util.h"
 #include "conf-files.h"
 #include "conf-parser.h"
 #include "dns-domain.h"
@@ -30,6 +31,9 @@
 #include "network-internal.h"
 #include "networkd-network.h"
 #include "networkd.h"
+#include "parse-util.h"
+#include "stat-util.h"
+#include "string-table.h"
 #include "string-util.h"
 #include "util.h"
 
diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index fcca679093..4a74bc69f3 100644
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -19,13 +19,15 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "alloc-util.h"
 #include "conf-parser.h"
 #include "in-addr-util.h"
 #include "netlink-util.h"
+#include "networkd-route.h"
 #include "networkd.h"
+#include "parse-util.h"
 #include "string-util.h"
 #include "util.h"
-#include "networkd-route.h"
 
 int route_new(Route **ret) {
         _cleanup_route_free_ Route *route = NULL;
diff --git a/src/network/networkd-util.c b/src/network/networkd-util.c
index 4e4a4bbd58..17165266ef 100644
--- a/src/network/networkd-util.c
+++ b/src/network/networkd-util.c
@@ -21,6 +21,8 @@
 
 #include "conf-parser.h"
 #include "networkd-util.h"
+#include "parse-util.h"
+#include "string-table.h"
 #include "string-util.h"
 #include "util.h"
 
diff --git a/src/network/networkd-wait-online-link.c b/src/network/networkd-wait-online-link.c
index cc4b46d5b0..c2779ff773 100644
--- a/src/network/networkd-wait-online-link.c
+++ b/src/network/networkd-wait-online-link.c
@@ -22,6 +22,7 @@
 
 #include "sd-network.h"
 
+#include "alloc-util.h"
 #include "networkd-wait-online-link.h"
 #include "string-util.h"
 
diff --git a/src/network/networkd-wait-online-manager.c b/src/network/networkd-wait-online-manager.c
index 112d92a568..0c40ab2bb8 100644
--- a/src/network/networkd-wait-online-manager.c
+++ b/src/network/networkd-wait-online-manager.c
@@ -23,14 +23,13 @@
 #include <linux/if.h>
 #include <fnmatch.h>
 
+#include "alloc-util.h"
 #include "netlink-util.h"
-
 #include "network-internal.h"
 #include "networkd-wait-online-link.h"
 #include "networkd-wait-online.h"
-
-#include "util.h"
 #include "time-util.h"
+#include "util.h"
 
 bool manager_ignore_link(Manager *m, Link *link) {
         char **ignore;
diff --git a/src/network/networkd.c b/src/network/networkd.c
index 1a17847715..c03ac69e27 100644
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -21,7 +21,7 @@
 
 #include "sd-daemon.h"
 
-#include "capability.h"
+#include "capability-util.h"
 #include "networkd.h"
 #include "signal-util.h"
 #include "user-util.h"
diff --git a/src/network/test-network.c b/src/network/test-network.c
index bac1d6781d..dbed3795e3 100644
--- a/src/network/test-network.c
+++ b/src/network/test-network.c
@@ -19,6 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "alloc-util.h"
 #include "networkd.h"
 #include "network-internal.h"
 #include "dhcp-lease-internal.h"