From 623f13d8198b83df890f014b1d27255f4d78f35b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 21 Oct 2016 03:00:49 -0400 Subject: wip --- src/libsystemd-network/test/test-acd.c | 6 +++--- src/libsystemd-network/test/test-dhcp-client.c | 6 +++--- src/libsystemd-network/test/test-dhcp-option.c | 6 +++--- src/libsystemd-network/test/test-dhcp6-client.c | 8 ++++---- src/libsystemd-network/test/test-ipv4ll-manual.c | 12 ++++++------ src/libsystemd-network/test/test-ipv4ll.c | 6 +++--- src/libsystemd-network/test/test-lldp.c | 8 ++++---- src/libsystemd-network/test/test-ndisc-rs.c | 8 ++++---- 8 files changed, 30 insertions(+), 30 deletions(-) (limited to 'src/libsystemd-network/test') diff --git a/src/libsystemd-network/test/test-acd.c b/src/libsystemd-network/test/test-acd.c index d79e71ab90..26480a2012 100644 --- a/src/libsystemd-network/test/test-acd.c +++ b/src/libsystemd-network/test/test-acd.c @@ -26,11 +26,11 @@ #include -#include "basic/in-addr-util.h" -#include "basic/util.h" #include "sd-netlink/netlink-util.h" -#include "sd-netlink/sd-netlink.h" +#include "systemd-basic/in-addr-util.h" +#include "systemd-basic/util.h" #include "systemd-network/sd-ipv4acd.h" +#include "systemd-staging/sd-netlink.h" static void acd_handler(sd_ipv4acd *acd, int event, void *userdata) { assert_se(acd); diff --git a/src/libsystemd-network/test/test-dhcp-client.c b/src/libsystemd-network/test/test-dhcp-client.c index 2b40ab8f48..e58491293c 100644 --- a/src/libsystemd-network/test/test-dhcp-client.c +++ b/src/libsystemd-network/test/test-dhcp-client.c @@ -24,9 +24,9 @@ #include -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/util.h" #include "systemd-network/dhcp-identifier.h" #include "systemd-network/dhcp-internal.h" #include "systemd-network/dhcp-protocol.h" diff --git a/src/libsystemd-network/test/test-dhcp-option.c b/src/libsystemd-network/test/test-dhcp-option.c index eda42b0ba5..2dfbb557c0 100644 --- a/src/libsystemd-network/test/test-dhcp-option.c +++ b/src/libsystemd-network/test/test-dhcp-option.c @@ -3,9 +3,9 @@ #include #include -#include "basic/alloc-util.h" -#include "basic/macro.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/util.h" #include "systemd-network/dhcp-internal.h" #include "systemd-network/dhcp-protocol.h" diff --git a/src/libsystemd-network/test/test-dhcp6-client.c b/src/libsystemd-network/test/test-dhcp6-client.c index 20019f4bba..84bb9f9013 100644 --- a/src/libsystemd-network/test/test-dhcp6-client.c +++ b/src/libsystemd-network/test/test-dhcp6-client.c @@ -26,10 +26,10 @@ #include -#include "basic/fd-util.h" -#include "basic/macro.h" -#include "basic/socket-util.h" -#include "basic/virt.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/socket-util.h" +#include "systemd-basic/virt.h" #include "systemd-network/dhcp6-internal.h" #include "systemd-network/dhcp6-lease-internal.h" #include "systemd-network/dhcp6-protocol.h" diff --git a/src/libsystemd-network/test/test-ipv4ll-manual.c b/src/libsystemd-network/test/test-ipv4ll-manual.c index 8dac0b1ca8..f67a8fe16c 100644 --- a/src/libsystemd-network/test/test-ipv4ll-manual.c +++ b/src/libsystemd-network/test/test-ipv4ll-manual.c @@ -26,14 +26,14 @@ #include -#include "basic/alloc-util.h" -#include "basic/in-addr-util.h" -#include "basic/parse-util.h" -#include "basic/string-util.h" -#include "basic/util.h" #include "sd-netlink/netlink-util.h" -#include "sd-netlink/sd-netlink.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/in-addr-util.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" #include "systemd-network/sd-ipv4ll.h" +#include "systemd-staging/sd-netlink.h" static void ll_handler(sd_ipv4ll *ll, int event, void *userdata) { _cleanup_free_ char *address = NULL; diff --git a/src/libsystemd-network/test/test-ipv4ll.c b/src/libsystemd-network/test/test-ipv4ll.c index 6d3e7f35d5..58912a1bf5 100644 --- a/src/libsystemd-network/test/test-ipv4ll.c +++ b/src/libsystemd-network/test/test-ipv4ll.c @@ -25,9 +25,9 @@ #include #include -#include "basic/fd-util.h" -#include "basic/socket-util.h" -#include "basic/util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/socket-util.h" +#include "systemd-basic/util.h" #include "systemd-network/arp-util.h" #include "systemd-network/sd-ipv4ll.h" diff --git a/src/libsystemd-network/test/test-lldp.c b/src/libsystemd-network/test/test-lldp.c index ad321621e4..27b6711916 100644 --- a/src/libsystemd-network/test/test-lldp.c +++ b/src/libsystemd-network/test/test-lldp.c @@ -26,10 +26,10 @@ #include -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/macro.h" -#include "basic/string-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/string-util.h" #include "systemd-network/lldp-network.h" #include "systemd-network/sd-lldp.h" diff --git a/src/libsystemd-network/test/test-ndisc-rs.c b/src/libsystemd-network/test/test-ndisc-rs.c index ff4b5c72ec..eb2dad5ab8 100644 --- a/src/libsystemd-network/test/test-ndisc-rs.c +++ b/src/libsystemd-network/test/test-ndisc-rs.c @@ -20,10 +20,10 @@ #include #include -#include "basic/alloc-util.h" -#include "basic/hexdecoct.h" -#include "basic/socket-util.h" -#include "basic/strv.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/hexdecoct.h" +#include "systemd-basic/socket-util.h" +#include "systemd-basic/strv.h" #include "systemd-network/icmp6-util.h" #include "systemd-network/sd-ndisc.h" -- cgit v1.2.3-54-g00ecf