From 458554a48c62b7885a9347bb7103922f3b1f69e3 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 27 Jul 2016 23:40:47 -0400 Subject: fix --- .../libnetworkd-core/networkd-address-pool.c | 6 ++-- .../libnetworkd-core/networkd-address-pool.h | 4 +-- .../libnetworkd-core/networkd-address.c | 14 +++++----- .../libnetworkd-core/networkd-address.h | 2 +- src/grp-network/libnetworkd-core/networkd-conf.c | 6 ++-- src/grp-network/libnetworkd-core/networkd-dhcp4.c | 4 +-- src/grp-network/libnetworkd-core/networkd-fdb.c | 4 +-- src/grp-network/libnetworkd-core/networkd-fdb.h | 4 +-- .../libnetworkd-core/networkd-link-bus.c | 6 ++-- src/grp-network/libnetworkd-core/networkd-link.c | 18 ++++++------ src/grp-network/libnetworkd-core/networkd-link.h | 4 +-- .../libnetworkd-core/networkd-lldp-tx.c | 18 ++++++------ .../libnetworkd-core/networkd-manager-bus.c | 2 +- .../libnetworkd-core/networkd-manager.c | 16 +++++------ .../libnetworkd-core/networkd-netdev-bond.c | 10 +++---- .../libnetworkd-core/networkd-netdev-bond.h | 4 +-- .../libnetworkd-core/networkd-netdev-bridge.c | 2 +- .../libnetworkd-core/networkd-netdev-ipvlan.c | 2 +- .../libnetworkd-core/networkd-netdev-ipvlan.h | 2 +- .../libnetworkd-core/networkd-netdev-macvlan.c | 2 +- .../libnetworkd-core/networkd-netdev-tunnel.c | 10 +++---- .../libnetworkd-core/networkd-netdev-tunnel.h | 2 +- .../libnetworkd-core/networkd-netdev-tuntap.c | 6 ++-- .../libnetworkd-core/networkd-netdev-vxlan.c | 8 +++--- .../libnetworkd-core/networkd-netdev-vxlan.h | 2 +- src/grp-network/libnetworkd-core/networkd-netdev.c | 16 +++++------ src/grp-network/libnetworkd-core/networkd-netdev.h | 4 +-- .../libnetworkd-core/networkd-network-bus.c | 6 ++-- .../libnetworkd-core/networkd-network.c | 20 +++++++------- .../libnetworkd-core/networkd-network.h | 2 +- src/grp-network/libnetworkd-core/networkd-route.c | 12 ++++---- src/grp-network/libnetworkd-core/networkd-util.c | 8 +++--- src/grp-network/libnetworkd-core/networkd-util.h | 2 +- src/grp-network/libnetworkd-core/networkd.h | 4 +-- src/grp-network/networkctl/networkctl.c | 32 +++++++++++----------- .../networkd-wait-online-link.c | 4 +-- .../networkd-wait-online-manager.c | 6 ++-- .../networkd-wait-online.c | 4 +-- .../networkd-wait-online.h | 2 +- src/grp-network/systemd-networkd/networkd.c | 6 ++-- src/grp-network/test-network.c | 2 +- src/grp-network/test-networkd-conf.c | 10 +++---- 42 files changed, 149 insertions(+), 149 deletions(-) (limited to 'src/grp-network') diff --git a/src/grp-network/libnetworkd-core/networkd-address-pool.c b/src/grp-network/libnetworkd-core/networkd-address-pool.c index ebc6c9eb9e..407ef06a09 100644 --- a/src/grp-network/libnetworkd-core/networkd-address-pool.c +++ b/src/grp-network/libnetworkd-core/networkd-address-pool.c @@ -17,11 +17,11 @@ along with systemd; If not, see . ***/ -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "networkd-address-pool.h" #include "networkd.h" -#include "set.h" -#include "string-util.h" +#include "basic/set.h" +#include "basic/string-util.h" int address_pool_new( Manager *m, diff --git a/src/grp-network/libnetworkd-core/networkd-address-pool.h b/src/grp-network/libnetworkd-core/networkd-address-pool.h index af30decfe0..d5659a9eeb 100644 --- a/src/grp-network/libnetworkd-core/networkd-address-pool.h +++ b/src/grp-network/libnetworkd-core/networkd-address-pool.h @@ -21,8 +21,8 @@ typedef struct AddressPool AddressPool; -#include "in-addr-util.h" -#include "list.h" +#include "basic/in-addr-util.h" +#include "basic/list.h" typedef struct Manager Manager; diff --git a/src/grp-network/libnetworkd-core/networkd-address.c b/src/grp-network/libnetworkd-core/networkd-address.c index 367c340e08..ed4c887479 100644 --- a/src/grp-network/libnetworkd-core/networkd-address.c +++ b/src/grp-network/libnetworkd-core/networkd-address.c @@ -19,18 +19,18 @@ #include -#include "alloc-util.h" +#include "basic/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 "socket-util.h" -#include "string-util.h" -#include "utf8.h" -#include "util.h" +#include "basic/parse-util.h" +#include "basic/set.h" +#include "basic/socket-util.h" +#include "basic/string-util.h" +#include "basic/utf8.h" +#include "basic/util.h" int address_new(Address **ret) { _cleanup_address_free_ Address *address = NULL; diff --git a/src/grp-network/libnetworkd-core/networkd-address.h b/src/grp-network/libnetworkd-core/networkd-address.h index 784ab18b27..1e178a0ca3 100644 --- a/src/grp-network/libnetworkd-core/networkd-address.h +++ b/src/grp-network/libnetworkd-core/networkd-address.h @@ -22,7 +22,7 @@ #include #include -#include "in-addr-util.h" +#include "basic/in-addr-util.h" typedef struct Address Address; diff --git a/src/grp-network/libnetworkd-core/networkd-conf.c b/src/grp-network/libnetworkd-core/networkd-conf.c index b67a1f6d09..1b3c4fa6e9 100644 --- a/src/grp-network/libnetworkd-core/networkd-conf.c +++ b/src/grp-network/libnetworkd-core/networkd-conf.c @@ -20,11 +20,11 @@ #include #include "conf-parser.h" -#include "def.h" +#include "basic/def.h" #include "dhcp-identifier.h" -#include "hexdecoct.h" +#include "basic/hexdecoct.h" #include "networkd-conf.h" -#include "string-table.h" +#include "basic/string-table.h" int manager_parse_config_file(Manager *m) { assert(m); diff --git a/src/grp-network/libnetworkd-core/networkd-dhcp4.c b/src/grp-network/libnetworkd-core/networkd-dhcp4.c index 2ddcee9db8..438ffd0842 100644 --- a/src/grp-network/libnetworkd-core/networkd-dhcp4.c +++ b/src/grp-network/libnetworkd-core/networkd-dhcp4.c @@ -20,9 +20,9 @@ #include #include -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "dhcp-lease-internal.h" -#include "hostname-util.h" +#include "basic/hostname-util.h" #include "network-internal.h" #include "networkd.h" diff --git a/src/grp-network/libnetworkd-core/networkd-fdb.c b/src/grp-network/libnetworkd-core/networkd-fdb.c index 241f486211..74e98b13dc 100644 --- a/src/grp-network/libnetworkd-core/networkd-fdb.c +++ b/src/grp-network/libnetworkd-core/networkd-fdb.c @@ -20,12 +20,12 @@ #include #include -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "conf-parser.h" #include "netlink-util.h" #include "networkd-fdb.h" #include "networkd.h" -#include "util.h" +#include "basic/util.h" /* create a new FDB entry or get an existing one. */ int fdb_entry_new_static(Network *const network, diff --git a/src/grp-network/libnetworkd-core/networkd-fdb.h b/src/grp-network/libnetworkd-core/networkd-fdb.h index 84410714f5..c04a2b0d37 100644 --- a/src/grp-network/libnetworkd-core/networkd-fdb.h +++ b/src/grp-network/libnetworkd-core/networkd-fdb.h @@ -19,8 +19,8 @@ along with systemd; If not, see . ***/ -#include "list.h" -#include "macro.h" +#include "basic/list.h" +#include "basic/macro.h" typedef struct Network Network; typedef struct FdbEntry FdbEntry; diff --git a/src/grp-network/libnetworkd-core/networkd-link-bus.c b/src/grp-network/libnetworkd-core/networkd-link-bus.c index 532557ed6c..e6e36d144b 100644 --- a/src/grp-network/libnetworkd-core/networkd-link-bus.c +++ b/src/grp-network/libnetworkd-core/networkd-link-bus.c @@ -17,12 +17,12 @@ along with systemd; If not, see . ***/ -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "bus-util.h" #include "networkd-link.h" #include "networkd.h" -#include "parse-util.h" -#include "strv.h" +#include "basic/parse-util.h" +#include "basic/strv.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/grp-network/libnetworkd-core/networkd-link.c b/src/grp-network/libnetworkd-core/networkd-link.c index a021fc886f..d17f6b12a2 100644 --- a/src/grp-network/libnetworkd-core/networkd-link.c +++ b/src/grp-network/libnetworkd-core/networkd-link.c @@ -21,22 +21,22 @@ #include #include -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "bus-util.h" #include "dhcp-lease-internal.h" -#include "fd-util.h" -#include "fileio.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" #include "netlink-util.h" #include "network-internal.h" #include "networkd.h" #include "networkd-lldp-tx.h" -#include "set.h" -#include "socket-util.h" -#include "stdio-util.h" -#include "string-table.h" +#include "basic/set.h" +#include "basic/socket-util.h" +#include "basic/stdio-util.h" +#include "basic/string-table.h" #include "udev-util.h" -#include "util.h" -#include "virt.h" +#include "basic/util.h" +#include "basic/virt.h" static bool link_dhcp6_enabled(Link *link) { assert(link); diff --git a/src/grp-network/libnetworkd-core/networkd-link.h b/src/grp-network/libnetworkd-core/networkd-link.h index 90cb9b93f6..ddb8b41f23 100644 --- a/src/grp-network/libnetworkd-core/networkd-link.h +++ b/src/grp-network/libnetworkd-core/networkd-link.h @@ -30,8 +30,8 @@ #include #include -#include "list.h" -#include "set.h" +#include "basic/list.h" +#include "basic/set.h" typedef enum LinkState { LINK_STATE_PENDING, diff --git a/src/grp-network/libnetworkd-core/networkd-lldp-tx.c b/src/grp-network/libnetworkd-core/networkd-lldp-tx.c index 3aa768388b..52c056e694 100644 --- a/src/grp-network/libnetworkd-core/networkd-lldp-tx.c +++ b/src/grp-network/libnetworkd-core/networkd-lldp-tx.c @@ -21,17 +21,17 @@ #include #include -#include "alloc-util.h" -#include "fd-util.h" -#include "fileio.h" -#include "hostname-util.h" +#include "basic/alloc-util.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/hostname-util.h" #include "networkd-lldp-tx.h" #include "networkd.h" -#include "parse-util.h" -#include "random-util.h" -#include "socket-util.h" -#include "string-util.h" -#include "unaligned.h" +#include "basic/parse-util.h" +#include "basic/random-util.h" +#include "basic/socket-util.h" +#include "basic/string-util.h" +#include "basic/unaligned.h" /* The LLDP spec calls this "txFastInit", see 9.2.5.19 */ #define LLDP_TX_FAST_INIT 4U diff --git a/src/grp-network/libnetworkd-core/networkd-manager-bus.c b/src/grp-network/libnetworkd-core/networkd-manager-bus.c index 0c429b9471..42ca07627d 100644 --- a/src/grp-network/libnetworkd-core/networkd-manager-bus.c +++ b/src/grp-network/libnetworkd-core/networkd-manager-bus.c @@ -17,7 +17,7 @@ along with systemd; If not, see . ***/ -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "bus-util.h" #include "networkd.h" diff --git a/src/grp-network/libnetworkd-core/networkd-manager.c b/src/grp-network/libnetworkd-core/networkd-manager.c index 7af7abaa81..a9493c38e2 100644 --- a/src/grp-network/libnetworkd-core/networkd-manager.c +++ b/src/grp-network/libnetworkd-core/networkd-manager.c @@ -23,22 +23,22 @@ #include #include -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "bus-util.h" #include "conf-parser.h" -#include "def.h" +#include "basic/def.h" #include "dns-domain.h" -#include "fd-util.h" -#include "fileio.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" #include "libudev-private.h" #include "local-addresses.h" #include "netlink-util.h" #include "networkd.h" -#include "ordered-set.h" -#include "path-util.h" -#include "set.h" +#include "basic/ordered-set.h" +#include "basic/path-util.h" +#include "basic/set.h" #include "udev-util.h" -#include "virt.h" +#include "basic/virt.h" /* use 8 MB for receive socket kernel queue. */ #define RCVBUF_SIZE (8*1024*1024) diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-bond.c b/src/grp-network/libnetworkd-core/networkd-netdev-bond.c index 7005b165d9..f2668f5382 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-bond.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-bond.c @@ -23,13 +23,13 @@ #include -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "conf-parser.h" -#include "extract-word.h" -#include "missing.h" +#include "basic/extract-word.h" +#include "basic/missing.h" #include "networkd-netdev-bond.h" -#include "string-table.h" -#include "string-util.h" +#include "basic/string-table.h" +#include "basic/string-util.h" /* * Number of seconds between instances where the bonding diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-bond.h b/src/grp-network/libnetworkd-core/networkd-netdev-bond.h index b941edb344..0ffb91b12e 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-bond.h +++ b/src/grp-network/libnetworkd-core/networkd-netdev-bond.h @@ -19,8 +19,8 @@ along with systemd; If not, see . ***/ -#include "in-addr-util.h" -#include "list.h" +#include "basic/in-addr-util.h" +#include "basic/list.h" #include "networkd-netdev.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-bridge.c b/src/grp-network/libnetworkd-core/networkd-netdev-bridge.c index 4cfd00413f..bb07ec59a6 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-bridge.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-bridge.c @@ -20,7 +20,7 @@ #include -#include "missing.h" +#include "basic/missing.h" #include "netlink-util.h" #include "networkd.h" #include "networkd-netdev-bridge.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.c b/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.c index af4177e43a..96a0bd600f 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.c @@ -21,7 +21,7 @@ #include "conf-parser.h" #include "networkd-netdev-ipvlan.h" -#include "string-table.h" +#include "basic/string-table.h" static const char* const ipvlan_mode_table[_NETDEV_IPVLAN_MODE_MAX] = { [NETDEV_IPVLAN_MODE_L2] = "L2", diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.h b/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.h index 10d4079844..00ad769756 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.h +++ b/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.h @@ -19,7 +19,7 @@ along with systemd; If not, see . ***/ -#include "missing.h" +#include "basic/missing.h" #include "networkd-netdev.h" typedef enum IPVlanMode { diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.c b/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.c index 48e98aa51b..a651b9a8ab 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.c @@ -21,7 +21,7 @@ #include "conf-parser.h" #include "networkd-netdev-macvlan.h" -#include "string-table.h" +#include "basic/string-table.h" static const char* const macvlan_mode_table[_NETDEV_MACVLAN_MODE_MAX] = { [NETDEV_MACVLAN_MODE_PRIVATE] = "private", diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c index 26a9a972f1..9d07072ce4 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c @@ -26,13 +26,13 @@ #include #include "conf-parser.h" -#include "missing.h" +#include "basic/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 "basic/parse-util.h" +#include "basic/string-table.h" +#include "basic/string-util.h" +#include "basic/util.h" #define DEFAULT_TNL_HOP_LIMIT 64 #define IP6_FLOWINFO_FLOWLABEL htonl(0x000FFFFF) diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.h b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.h index 7d31e7b687..6b65431e7e 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.h +++ b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.h @@ -19,7 +19,7 @@ along with systemd; If not, see . ***/ -#include "in-addr-util.h" +#include "basic/in-addr-util.h" #include "networkd-netdev.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-tuntap.c b/src/grp-network/libnetworkd-core/networkd-netdev-tuntap.c index 088a4d8d32..1f0752cd0a 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-tuntap.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-tuntap.c @@ -25,10 +25,10 @@ #include #include -#include "alloc-util.h" -#include "fd-util.h" +#include "basic/alloc-util.h" +#include "basic/fd-util.h" #include "networkd-netdev-tuntap.h" -#include "user-util.h" +#include "basic/user-util.h" #define TUN_DEV "/dev/net/tun" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c b/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c index 363a6bdde6..e3d75ac034 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c @@ -22,10 +22,10 @@ #include #include "conf-parser.h" -#include "alloc-util.h" -#include "extract-word.h" -#include "parse-util.h" -#include "missing.h" +#include "basic/alloc-util.h" +#include "basic/extract-word.h" +#include "basic/parse-util.h" +#include "basic/missing.h" #include "networkd-link.h" #include "networkd-netdev-vxlan.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.h b/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.h index 4614c66fd1..097e4e2369 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.h +++ b/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.h @@ -21,7 +21,7 @@ typedef struct VxLan VxLan; -#include "in-addr-util.h" +#include "basic/in-addr-util.h" #include "networkd-netdev.h" #define VXLAN_VID_MAX (1u << 24) - 1 diff --git a/src/grp-network/libnetworkd-core/networkd-netdev.c b/src/grp-network/libnetworkd-core/networkd-netdev.c index 851a36290c..7409542be0 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev.c @@ -19,19 +19,19 @@ #include -#include "alloc-util.h" -#include "conf-files.h" +#include "basic/alloc-util.h" +#include "basic/conf-files.h" #include "conf-parser.h" -#include "fd-util.h" -#include "list.h" +#include "basic/fd-util.h" +#include "basic/list.h" #include "netlink-util.h" #include "network-internal.h" #include "networkd-netdev.h" #include "networkd.h" -#include "siphash24.h" -#include "stat-util.h" -#include "string-table.h" -#include "string-util.h" +#include "basic/siphash24.h" +#include "basic/stat-util.h" +#include "basic/string-table.h" +#include "basic/string-util.h" const NetDevVTable * const netdev_vtable[_NETDEV_KIND_MAX] = { diff --git a/src/grp-network/libnetworkd-core/networkd-netdev.h b/src/grp-network/libnetworkd-core/networkd-netdev.h index ab3f068167..fcfee9e234 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev.h +++ b/src/grp-network/libnetworkd-core/networkd-netdev.h @@ -21,8 +21,8 @@ #include -#include "list.h" -#include "time-util.h" +#include "basic/list.h" +#include "basic/time-util.h" typedef struct netdev_join_callback netdev_join_callback; typedef struct Link Link; diff --git a/src/grp-network/libnetworkd-core/networkd-network-bus.c b/src/grp-network/libnetworkd-core/networkd-network-bus.c index d6b7448a43..f218cf624c 100644 --- a/src/grp-network/libnetworkd-core/networkd-network-bus.c +++ b/src/grp-network/libnetworkd-core/networkd-network-bus.c @@ -17,10 +17,10 @@ along with systemd; If not, see . ***/ -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "networkd.h" -#include "string-util.h" -#include "strv.h" +#include "basic/string-util.h" +#include "basic/strv.h" static int property_get_ether_addrs( sd_bus *bus, diff --git a/src/grp-network/libnetworkd-core/networkd-network.c b/src/grp-network/libnetworkd-core/networkd-network.c index dd89b3770c..99a6859e40 100644 --- a/src/grp-network/libnetworkd-core/networkd-network.c +++ b/src/grp-network/libnetworkd-core/networkd-network.c @@ -20,21 +20,21 @@ #include #include -#include "alloc-util.h" -#include "conf-files.h" +#include "basic/alloc-util.h" +#include "basic/conf-files.h" #include "conf-parser.h" #include "dns-domain.h" -#include "fd-util.h" -#include "hostname-util.h" +#include "basic/fd-util.h" +#include "basic/hostname-util.h" #include "network-internal.h" #include "networkd-network.h" #include "networkd.h" -#include "parse-util.h" -#include "set.h" -#include "stat-util.h" -#include "string-table.h" -#include "string-util.h" -#include "util.h" +#include "basic/parse-util.h" +#include "basic/set.h" +#include "basic/stat-util.h" +#include "basic/string-table.h" +#include "basic/string-util.h" +#include "basic/util.h" static int network_load_one(Manager *manager, const char *filename) { _cleanup_network_free_ Network *network = NULL; diff --git a/src/grp-network/libnetworkd-core/networkd-network.h b/src/grp-network/libnetworkd-core/networkd-network.h index 177bc11ec4..e5352e497a 100644 --- a/src/grp-network/libnetworkd-core/networkd-network.h +++ b/src/grp-network/libnetworkd-core/networkd-network.h @@ -24,7 +24,7 @@ #include "condition.h" #include "dhcp-identifier.h" -#include "hashmap.h" +#include "basic/hashmap.h" #include "resolve-util.h" #include "networkd-address.h" diff --git a/src/grp-network/libnetworkd-core/networkd-route.c b/src/grp-network/libnetworkd-core/networkd-route.c index f001de772a..bf34f445fe 100644 --- a/src/grp-network/libnetworkd-core/networkd-route.c +++ b/src/grp-network/libnetworkd-core/networkd-route.c @@ -17,16 +17,16 @@ along with systemd; If not, see . ***/ -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "conf-parser.h" -#include "in-addr-util.h" +#include "basic/in-addr-util.h" #include "netlink-util.h" #include "networkd-route.h" #include "networkd.h" -#include "parse-util.h" -#include "set.h" -#include "string-util.h" -#include "util.h" +#include "basic/parse-util.h" +#include "basic/set.h" +#include "basic/string-util.h" +#include "basic/util.h" int route_new(Route **ret) { _cleanup_route_free_ Route *route = NULL; diff --git a/src/grp-network/libnetworkd-core/networkd-util.c b/src/grp-network/libnetworkd-core/networkd-util.c index 555a7c68a1..f33cd3e916 100644 --- a/src/grp-network/libnetworkd-core/networkd-util.c +++ b/src/grp-network/libnetworkd-core/networkd-util.c @@ -19,10 +19,10 @@ #include "conf-parser.h" #include "networkd-util.h" -#include "parse-util.h" -#include "string-table.h" -#include "string-util.h" -#include "util.h" +#include "basic/parse-util.h" +#include "basic/string-table.h" +#include "basic/string-util.h" +#include "basic/util.h" const char *address_family_boolean_to_string(AddressFamilyBoolean b) { if (b == ADDRESS_FAMILY_YES || diff --git a/src/grp-network/libnetworkd-core/networkd-util.h b/src/grp-network/libnetworkd-core/networkd-util.h index d5c385bea4..d023782285 100644 --- a/src/grp-network/libnetworkd-core/networkd-util.h +++ b/src/grp-network/libnetworkd-core/networkd-util.h @@ -19,7 +19,7 @@ along with systemd; If not, see . ***/ -#include "macro.h" +#include "basic/macro.h" typedef enum AddressFamilyBoolean { /* This is a bitmask, though it usually doesn't feel that way! */ diff --git a/src/grp-network/libnetworkd-core/networkd.h b/src/grp-network/libnetworkd-core/networkd.h index b61e03920e..cabd43b8e1 100644 --- a/src/grp-network/libnetworkd-core/networkd.h +++ b/src/grp-network/libnetworkd-core/networkd.h @@ -27,8 +27,8 @@ #include "udev.h" #include "dhcp-identifier.h" -#include "hashmap.h" -#include "list.h" +#include "basic/hashmap.h" +#include "basic/list.h" #include "networkd-address-pool.h" #include "networkd-link.h" diff --git a/src/grp-network/networkctl/networkctl.c b/src/grp-network/networkctl/networkctl.c index 85635b59bc..a2c51e4b9e 100644 --- a/src/grp-network/networkctl/networkctl.c +++ b/src/grp-network/networkctl/networkctl.c @@ -27,27 +27,27 @@ #include #include -#include "alloc-util.h" -#include "arphrd-list.h" +#include "basic/alloc-util.h" +#include "basic/arphrd-list.h" #include "device-util.h" -#include "ether-addr-util.h" -#include "fd-util.h" +#include "basic/ether-addr-util.h" +#include "basic/fd-util.h" #include "hwdb-util.h" #include "local-addresses.h" -#include "locale-util.h" +#include "basic/locale-util.h" #include "netlink-util.h" #include "pager.h" -#include "parse-util.h" -#include "socket-util.h" -#include "sparse-endian.h" -#include "stdio-util.h" -#include "string-table.h" -#include "string-util.h" -#include "strv.h" -#include "strxcpyx.h" -#include "terminal-util.h" -#include "util.h" -#include "verbs.h" +#include "basic/parse-util.h" +#include "basic/socket-util.h" +#include "basic/sparse-endian.h" +#include "basic/stdio-util.h" +#include "basic/string-table.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/strxcpyx.h" +#include "basic/terminal-util.h" +#include "basic/util.h" +#include "basic/verbs.h" static bool arg_no_pager = false; static bool arg_legend = true; diff --git a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-link.c b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-link.c index 971545296f..f03de93540 100644 --- a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-link.c +++ b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-link.c @@ -20,9 +20,9 @@ #include -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "networkd-wait-online-link.h" -#include "string-util.h" +#include "basic/string-util.h" int link_new(Manager *m, Link **ret, int ifindex, const char *ifname) { _cleanup_(link_freep) Link *l = NULL; diff --git a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c index 2ff7ddb044..fbf7a96f45 100644 --- a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c +++ b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c @@ -21,13 +21,13 @@ #include #include -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "netlink-util.h" #include "network-internal.h" #include "networkd-wait-online-link.h" #include "networkd-wait-online.h" -#include "time-util.h" -#include "util.h" +#include "basic/time-util.h" +#include "basic/util.h" bool manager_ignore_link(Manager *m, Link *link) { char **ignore; diff --git a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.c b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.c index a08272463e..ac3109ee78 100644 --- a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.c +++ b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.c @@ -23,8 +23,8 @@ #include #include "networkd-wait-online.h" -#include "signal-util.h" -#include "strv.h" +#include "basic/signal-util.h" +#include "basic/strv.h" static bool arg_quiet = false; static usec_t arg_timeout = 120 * USEC_PER_SEC; diff --git a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.h b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.h index 7ac7f4018a..46d01d2bf3 100644 --- a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.h +++ b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.h @@ -23,7 +23,7 @@ #include #include -#include "hashmap.h" +#include "basic/hashmap.h" typedef struct Manager Manager; diff --git a/src/grp-network/systemd-networkd/networkd.c b/src/grp-network/systemd-networkd/networkd.c index 9f5c75ac3d..641a1e2f08 100644 --- a/src/grp-network/systemd-networkd/networkd.c +++ b/src/grp-network/systemd-networkd/networkd.c @@ -19,11 +19,11 @@ #include -#include "capability-util.h" +#include "basic/capability-util.h" #include "networkd.h" #include "networkd-conf.h" -#include "signal-util.h" -#include "user-util.h" +#include "basic/signal-util.h" +#include "basic/user-util.h" int main(int argc, char *argv[]) { _cleanup_manager_free_ Manager *m = NULL; diff --git a/src/grp-network/test-network.c b/src/grp-network/test-network.c index 855646173f..7e94cff59e 100644 --- a/src/grp-network/test-network.c +++ b/src/grp-network/test-network.c @@ -17,7 +17,7 @@ along with systemd; If not, see . ***/ -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "dhcp-lease-internal.h" #include "network-internal.h" #include "networkd.h" diff --git a/src/grp-network/test-networkd-conf.c b/src/grp-network/test-networkd-conf.c index 0e1a18457d..91863d8a9e 100644 --- a/src/grp-network/test-networkd-conf.c +++ b/src/grp-network/test-networkd-conf.c @@ -17,11 +17,11 @@ along with systemd; If not, see . ***/ -#include "hexdecoct.h" -#include "log.h" -#include "macro.h" -#include "string-util.h" -#include "ether-addr-util.h" +#include "basic/hexdecoct.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/string-util.h" +#include "basic/ether-addr-util.h" #include "networkd-conf.h" #include "networkd-network.h" -- cgit v1.2.3-54-g00ecf