From 6bedfcbb2970e06a4d3280c8fb62083d252ede73 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 26 Oct 2015 16:18:16 +0100 Subject: util-lib: split string parsing related calls from util.[ch] into parse-util.[ch] --- src/network/networkctl.c | 1 + src/network/networkd-address.c | 3 ++- src/network/networkd-link-bus.c | 3 ++- src/network/networkd-netdev-tunnel.c | 3 ++- src/network/networkd-network.c | 1 + src/network/networkd-route.c | 3 ++- src/network/networkd-util.c | 1 + 7 files changed, 11 insertions(+), 4 deletions(-) (limited to 'src/network') diff --git a/src/network/networkctl.c b/src/network/networkctl.c index acb6b7ce24..be679acca0 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -36,6 +36,7 @@ #include "local-addresses.h" #include "netlink-util.h" #include "pager.h" +#include "parse-util.h" #include "socket-util.h" #include "string-util.h" #include "strv.h" diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index dcd7b482d3..1beb7ffae4 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -24,12 +24,13 @@ #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-link-bus.c b/src/network/networkd-link-bus.c index 1a1524dfb4..f40a01fd78 100644 --- a/src/network/networkd-link-bus.c +++ b/src/network/networkd-link-bus.c @@ -22,8 +22,9 @@ #include "bus-util.h" #include "strv.h" -#include "networkd.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-netdev-tunnel.c b/src/network/networkd-netdev-tunnel.c index bbc4606258..2dd16be381 100644 --- a/src/network/networkd-netdev-tunnel.c +++ b/src/network/networkd-netdev-tunnel.c @@ -30,9 +30,10 @@ #include "conf-parser.h" #include "missing.h" #include "networkd-link.h" +#include "networkd-netdev-tunnel.h" +#include "parse-util.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-network.c b/src/network/networkd-network.c index 150fd052c2..6cef5fb7aa 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -30,6 +30,7 @@ #include "network-internal.h" #include "networkd-network.h" #include "networkd.h" +#include "parse-util.h" #include "string-util.h" #include "util.h" diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c index fcca679093..7ae6ca2600 100644 --- a/src/network/networkd-route.c +++ b/src/network/networkd-route.c @@ -22,10 +22,11 @@ #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..3ada0ce32b 100644 --- a/src/network/networkd-util.c +++ b/src/network/networkd-util.c @@ -21,6 +21,7 @@ #include "conf-parser.h" #include "networkd-util.h" +#include "parse-util.h" #include "string-util.h" #include "util.h" -- cgit v1.2.3-54-g00ecf