From 01a67dbfc491832def1ba8a2c3e7cda228e6f7c2 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 2 Aug 2016 17:54:39 -0400 Subject: ./fixup.sh --- src/libsystemd-network/include/systemd-network/dhcp-internal.h | 8 +++++--- .../include/systemd-network/dhcp-lease-internal.h | 8 +++++--- .../include/systemd-network/dhcp-server-internal.h | 5 +++-- .../include/systemd-network/dhcp6-lease-internal.h | 4 ++-- src/libsystemd-network/include/systemd-network/lldp-internal.h | 3 ++- src/libsystemd-network/include/systemd-network/lldp-neighbor.h | 5 +++-- src/libsystemd-network/include/systemd-network/network-internal.h | 3 ++- src/libsystemd-network/include/systemd-network/sd-dhcp-client.h | 3 +-- src/libsystemd-network/include/systemd-network/sd-dhcp6-client.h | 3 +-- 9 files changed, 24 insertions(+), 18 deletions(-) (limited to 'src/libsystemd-network/include/systemd-network') diff --git a/src/libsystemd-network/include/systemd-network/dhcp-internal.h b/src/libsystemd-network/include/systemd-network/dhcp-internal.h index 0fb012e240..63c85b853c 100644 --- a/src/libsystemd-network/include/systemd-network/dhcp-internal.h +++ b/src/libsystemd-network/include/systemd-network/dhcp-internal.h @@ -20,14 +20,16 @@ along with systemd; If not, see . ***/ -#include #include #include #include +#include + #include "basic/socket-util.h" -#include "systemd-network/dhcp-protocol.h" -#include "systemd-network/sd-dhcp-client.h" + +#include "dhcp-protocol.h" +#include "sd-dhcp-client.h" int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link, uint32_t xid, const uint8_t *mac_addr, diff --git a/src/libsystemd-network/include/systemd-network/dhcp-lease-internal.h b/src/libsystemd-network/include/systemd-network/dhcp-lease-internal.h index d4108c1095..af66781ac7 100644 --- a/src/libsystemd-network/include/systemd-network/dhcp-lease-internal.h +++ b/src/libsystemd-network/include/systemd-network/dhcp-lease-internal.h @@ -20,13 +20,15 @@ along with systemd; If not, see . ***/ -#include #include +#include + #include "basic/list.h" #include "basic/util.h" -#include "systemd-network/dhcp-protocol.h" -#include "systemd-network/sd-dhcp-client.h" + +#include "dhcp-protocol.h" +#include "sd-dhcp-client.h" struct sd_dhcp_route { struct in_addr dst_addr; diff --git a/src/libsystemd-network/include/systemd-network/dhcp-server-internal.h b/src/libsystemd-network/include/systemd-network/dhcp-server-internal.h index 53b46a8514..45f5946e59 100644 --- a/src/libsystemd-network/include/systemd-network/dhcp-server-internal.h +++ b/src/libsystemd-network/include/systemd-network/dhcp-server-internal.h @@ -25,8 +25,9 @@ #include "basic/hashmap.h" #include "basic/log.h" #include "basic/util.h" -#include "systemd-network/dhcp-internal.h" -#include "systemd-network/sd-dhcp-server.h" + +#include "dhcp-internal.h" +#include "sd-dhcp-server.h" typedef struct DHCPClientId { size_t length; diff --git a/src/libsystemd-network/include/systemd-network/dhcp6-lease-internal.h b/src/libsystemd-network/include/systemd-network/dhcp6-lease-internal.h index 3f51830c94..9da270e9a9 100644 --- a/src/libsystemd-network/include/systemd-network/dhcp6-lease-internal.h +++ b/src/libsystemd-network/include/systemd-network/dhcp6-lease-internal.h @@ -22,8 +22,8 @@ #include -#include "systemd-network/dhcp6-internal.h" -#include "systemd-network/sd-dhcp6-lease.h" +#include "dhcp6-internal.h" +#include "sd-dhcp6-lease.h" struct sd_dhcp6_lease { unsigned n_ref; diff --git a/src/libsystemd-network/include/systemd-network/lldp-internal.h b/src/libsystemd-network/include/systemd-network/lldp-internal.h index a79031b40d..f657a1d0af 100644 --- a/src/libsystemd-network/include/systemd-network/lldp-internal.h +++ b/src/libsystemd-network/include/systemd-network/lldp-internal.h @@ -25,7 +25,8 @@ #include "basic/hashmap.h" #include "basic/log.h" #include "basic/prioq.h" -#include "systemd-network/sd-lldp.h" + +#include "sd-lldp.h" struct sd_lldp { int ifindex; diff --git a/src/libsystemd-network/include/systemd-network/lldp-neighbor.h b/src/libsystemd-network/include/systemd-network/lldp-neighbor.h index cbd9470be0..b5944164fc 100644 --- a/src/libsystemd-network/include/systemd-network/lldp-neighbor.h +++ b/src/libsystemd-network/include/systemd-network/lldp-neighbor.h @@ -25,8 +25,9 @@ #include "basic/hash-funcs.h" #include "basic/time-util.h" -#include "systemd-network/lldp-internal.h" -#include "systemd-network/sd-lldp.h" + +#include "lldp-internal.h" +#include "sd-lldp.h" typedef struct LLDPNeighborID { /* The spec calls this an "MSAP identifier" */ diff --git a/src/libsystemd-network/include/systemd-network/network-internal.h b/src/libsystemd-network/include/systemd-network/network-internal.h index 4f98e84c80..a5cf8e4f1c 100644 --- a/src/libsystemd-network/include/systemd-network/network-internal.h +++ b/src/libsystemd-network/include/systemd-network/network-internal.h @@ -22,9 +22,10 @@ #include #include "shared/condition.h" -#include "systemd-network/sd-dhcp-lease.h" #include "udev.h" +#include "sd-dhcp-lease.h" + bool net_match_config(const struct ether_addr *match_mac, char * const *match_path, char * const *match_driver, diff --git a/src/libsystemd-network/include/systemd-network/sd-dhcp-client.h b/src/libsystemd-network/include/systemd-network/sd-dhcp-client.h index 375acd5ea7..4704c6b440 100644 --- a/src/libsystemd-network/include/systemd-network/sd-dhcp-client.h +++ b/src/libsystemd-network/include/systemd-network/sd-dhcp-client.h @@ -27,9 +27,8 @@ #include -#include "systemd-network/sd-dhcp-lease.h" - #include "_sd-common.h" +#include "sd-dhcp-lease.h" _SD_BEGIN_DECLARATIONS; diff --git a/src/libsystemd-network/include/systemd-network/sd-dhcp6-client.h b/src/libsystemd-network/include/systemd-network/sd-dhcp6-client.h index 7111ca1274..16947079bb 100644 --- a/src/libsystemd-network/include/systemd-network/sd-dhcp6-client.h +++ b/src/libsystemd-network/include/systemd-network/sd-dhcp6-client.h @@ -26,9 +26,8 @@ #include -#include "systemd-network/sd-dhcp6-lease.h" - #include "_sd-common.h" +#include "sd-dhcp6-lease.h" _SD_BEGIN_DECLARATIONS; -- cgit v1.2.3-54-g00ecf