From 2eec67acbb00593e414549a7e5b35eb7dd776b1b Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Sat, 14 Feb 2015 09:44:31 +0100 Subject: remove unused includes This patch removes includes that are not used. The removals were found with include-what-you-use which checks if any of the symbols from a header is in use. --- src/network/networkd-address-pool.c | 1 - src/network/networkd-address.c | 1 - src/network/networkd-fdb.c | 5 ----- src/network/networkd-link.c | 3 --- src/network/networkd-manager.c | 2 -- src/network/networkd-netdev-bond.c | 1 - src/network/networkd-netdev-bridge.c | 4 ---- src/network/networkd-netdev-dummy.c | 5 ----- src/network/networkd-netdev-ipvlan.c | 3 --- src/network/networkd-netdev-macvlan.c | 2 -- src/network/networkd-netdev-tunnel.c | 2 -- src/network/networkd-netdev-veth.c | 2 -- src/network/networkd-netdev-vlan.c | 2 -- src/network/networkd-netdev-vxlan.c | 2 -- src/network/networkd-netdev.c | 1 - src/network/networkd-netdev.h | 3 --- src/network/networkd-network-bus.c | 2 -- src/network/networkd-network.c | 1 - src/network/networkd-route.c | 3 --- src/network/networkd-wait-online-link.c | 2 -- src/network/networkd-wait-online-manager.c | 1 - src/network/networkd-wait-online.h | 1 - src/network/networkd.c | 1 - src/network/test-network-tables.c | 1 - 24 files changed, 51 deletions(-) (limited to 'src/network') diff --git a/src/network/networkd-address-pool.c b/src/network/networkd-address-pool.c index 7ad11c6177..584a956a7e 100644 --- a/src/network/networkd-address-pool.c +++ b/src/network/networkd-address-pool.c @@ -19,7 +19,6 @@ along with systemd; If not, see . ***/ -#include #include "networkd.h" #include "networkd-link.h" diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index 47033acde4..255ff77022 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -25,7 +25,6 @@ #include "util.h" #include "conf-parser.h" #include "fw-util.h" -#include "network-internal.h" #include "networkd.h" #include "networkd-link.h" diff --git a/src/network/networkd-fdb.c b/src/network/networkd-fdb.c index feab8d421e..b6b8327b23 100644 --- a/src/network/networkd-fdb.c +++ b/src/network/networkd-fdb.c @@ -19,16 +19,11 @@ along with systemd; If not, see . ***/ -#include #include #include #include "networkd.h" -#include "networkd-netdev.h" #include "networkd-link.h" -#include "network-internal.h" -#include "path-util.h" -#include "conf-files.h" #include "conf-parser.h" #include "util.h" diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index f716e8231a..0665e1fcfa 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -28,12 +28,9 @@ #include "fileio.h" #include "bus-util.h" #include "udev-util.h" -#include "libudev-private.h" #include "network-internal.h" #include "networkd-link.h" #include "networkd-netdev.h" -#include "conf-parser.h" -#include "dhcp-lease-internal.h" bool link_dhcp6_enabled(Link *link) { if (link->flags & IFF_LOOPBACK) diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index ce97ac0778..cffae835f5 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -27,13 +27,11 @@ #include "networkd.h" #include "networkd-netdev.h" #include "networkd-link.h" -#include "network-internal.h" #include "libudev-private.h" #include "udev-util.h" #include "rtnl-util.h" #include "bus-util.h" #include "def.h" -#include "mkdir.h" #include "virt.h" #include "sd-rtnl.h" diff --git a/src/network/networkd-netdev-bond.c b/src/network/networkd-netdev-bond.c index 88321ef84c..c9115516fd 100644 --- a/src/network/networkd-netdev-bond.c +++ b/src/network/networkd-netdev-bond.c @@ -21,7 +21,6 @@ ***/ #include -#include #include #include "conf-parser.h" diff --git a/src/network/networkd-netdev-bridge.c b/src/network/networkd-netdev-bridge.c index 91b7051a06..fd6af7e99b 100644 --- a/src/network/networkd-netdev-bridge.c +++ b/src/network/networkd-netdev-bridge.c @@ -20,11 +20,7 @@ along with systemd; If not, see . ***/ -#include -#include -#include -#include "sd-rtnl.h" #include "networkd-netdev-bridge.h" #include "missing.h" diff --git a/src/network/networkd-netdev-dummy.c b/src/network/networkd-netdev-dummy.c index 01c10a2d73..bb246a2be0 100644 --- a/src/network/networkd-netdev-dummy.c +++ b/src/network/networkd-netdev-dummy.c @@ -20,12 +20,7 @@ along with systemd; If not, see . ***/ -#include -#include -#include -#include -#include "sd-rtnl.h" #include "networkd-netdev-dummy.h" const NetDevVTable dummy_vtable = { diff --git a/src/network/networkd-netdev-ipvlan.c b/src/network/networkd-netdev-ipvlan.c index 9a7c280c6b..5189000c1f 100644 --- a/src/network/networkd-netdev-ipvlan.c +++ b/src/network/networkd-netdev-ipvlan.c @@ -20,12 +20,9 @@ ***/ #include -#include #include "networkd-netdev-ipvlan.h" -#include "network-internal.h" #include "conf-parser.h" -#include "list.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 198fb575ee..5f41f1c865 100644 --- a/src/network/networkd-netdev-macvlan.c +++ b/src/network/networkd-netdev-macvlan.c @@ -22,9 +22,7 @@ #include #include "networkd-netdev-macvlan.h" -#include "network-internal.h" #include "conf-parser.h" -#include "list.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 e95082d119..89ad3ee048 100644 --- a/src/network/networkd-netdev-tunnel.c +++ b/src/network/networkd-netdev-tunnel.c @@ -19,7 +19,6 @@ along with systemd; If not, see . ***/ -#include #include #include #include @@ -29,7 +28,6 @@ #include "sd-rtnl.h" #include "networkd-netdev-tunnel.h" #include "networkd-link.h" -#include "network-internal.h" #include "util.h" #include "missing.h" #include "conf-parser.h" diff --git a/src/network/networkd-netdev-veth.c b/src/network/networkd-netdev-veth.c index 251cf92aec..9e9e1225e7 100644 --- a/src/network/networkd-netdev-veth.c +++ b/src/network/networkd-netdev-veth.c @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include -#include #include #include diff --git a/src/network/networkd-netdev-vlan.c b/src/network/networkd-netdev-vlan.c index 665559f895..0ed024b41d 100644 --- a/src/network/networkd-netdev-vlan.c +++ b/src/network/networkd-netdev-vlan.c @@ -22,8 +22,6 @@ #include #include "networkd-netdev-vlan.h" -#include "network-internal.h" -#include "list.h" static int netdev_vlan_fill_message_create(NetDev *netdev, Link *link, sd_rtnl_message *req) { VLan *v = VLAN(netdev); diff --git a/src/network/networkd-netdev-vxlan.c b/src/network/networkd-netdev-vxlan.c index d5128cb7c0..4a3a51104f 100644 --- a/src/network/networkd-netdev-vxlan.c +++ b/src/network/networkd-netdev-vxlan.c @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include -#include #include #include "sd-rtnl.h" diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c index 8119205dde..3d7cc73451 100644 --- a/src/network/networkd-netdev.c +++ b/src/network/networkd-netdev.c @@ -24,7 +24,6 @@ #include "networkd-netdev.h" #include "networkd-link.h" #include "network-internal.h" -#include "path-util.h" #include "conf-files.h" #include "conf-parser.h" #include "list.h" diff --git a/src/network/networkd-netdev.h b/src/network/networkd-netdev.h index 3756b1e5a7..7fd83964a5 100644 --- a/src/network/networkd-netdev.h +++ b/src/network/networkd-netdev.h @@ -22,10 +22,7 @@ #pragma once #include "networkd.h" -#include "hashmap.h" #include "list.h" -#include "set.h" -#include "in-addr-util.h" typedef struct NetDevVTable NetDevVTable; diff --git a/src/network/networkd-network-bus.c b/src/network/networkd-network-bus.c index 36b40d32b9..b5f8f5cfb2 100644 --- a/src/network/networkd-network-bus.c +++ b/src/network/networkd-network-bus.c @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "bus-util.h" -#include "bus-label.h" #include "strv.h" #include "networkd.h" diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index 35ac064cf6..c6cf00a5e5 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -22,7 +22,6 @@ #include #include -#include "path-util.h" #include "conf-files.h" #include "conf-parser.h" #include "util.h" diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c index c2d1ffca25..7f110a5217 100644 --- a/src/network/networkd-route.c +++ b/src/network/networkd-route.c @@ -19,15 +19,12 @@ along with systemd; If not, see . ***/ -#include #include "networkd.h" #include "networkd-link.h" -#include "utf8.h" #include "util.h" #include "conf-parser.h" -#include "network-internal.h" int route_new_static(Network *network, unsigned section, Route **ret) { _cleanup_route_free_ Route *route = NULL; diff --git a/src/network/networkd-wait-online-link.c b/src/network/networkd-wait-online-link.c index e091b20ed9..341bcae3fb 100644 --- a/src/network/networkd-wait-online-link.c +++ b/src/network/networkd-wait-online-link.c @@ -20,10 +20,8 @@ along with systemd; If not, see . ***/ -#include #include "sd-network.h" -#include "strv.h" #include "networkd-wait-online-link.h" diff --git a/src/network/networkd-wait-online-manager.c b/src/network/networkd-wait-online-manager.c index cafe110e50..1c997a50a4 100644 --- a/src/network/networkd-wait-online-manager.c +++ b/src/network/networkd-wait-online-manager.c @@ -25,7 +25,6 @@ #include "rtnl-util.h" -#include "network-util.h" #include "network-internal.h" #include "networkd-wait-online-link.h" #include "networkd-wait-online.h" diff --git a/src/network/networkd-wait-online.h b/src/network/networkd-wait-online.h index 66b865cfe2..73d129699d 100644 --- a/src/network/networkd-wait-online.h +++ b/src/network/networkd-wait-online.h @@ -25,7 +25,6 @@ #include "sd-rtnl.h" #include "sd-network.h" -#include "util.h" #include "hashmap.h" typedef struct Manager Manager; diff --git a/src/network/networkd.c b/src/network/networkd.c index 7319276c53..723d10547c 100644 --- a/src/network/networkd.c +++ b/src/network/networkd.c @@ -20,7 +20,6 @@ ***/ #include "capability.h" -#include "sd-event.h" #include "sd-daemon.h" #include "networkd.h" diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c index 6709ab0957..67fcca2ac0 100644 --- a/src/network/test-network-tables.c +++ b/src/network/test-network-tables.c @@ -1,5 +1,4 @@ #include "networkd.h" -#include "networkd-link.h" #include "networkd-netdev-bond.h" #include "networkd-netdev-macvlan.h" #include "dhcp6-internal.h" -- cgit v1.2.3-54-g00ecf