networkd-wait-online: move to separate subdirectory

Also clean up the header files a bit.

diff --git a/Makefile.am b/Makefile.am
index 82879a17e4cda51e0104ffbac861fdddf7fffc70..be4a28bac7b7e974c6ab4aa4edf97a74c4dcbf09 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5684,11 +5684,11 @@ systemd_networkd_wait_online_CFLAGS = \
 
 systemd_networkd_wait_online_SOURCES = \
        src/libsystemd-network/network-internal.h \
-       src/network/networkd-wait-online.h \
-       src/network/networkd-wait-online-link.h \
-       src/network/networkd-wait-online.c \
-       src/network/networkd-wait-online-manager.c \
-       src/network/networkd-wait-online-link.c
+       src/network/wait-online/link.h \
+       src/network/wait-online/link.c \
+       src/network/wait-online/manager.h \
+       src/network/wait-online/manager.c \
+       src/network/wait-online/wait-online.c
 
 systemd_networkd_wait_online_LDADD = \
        libsystemd-network.la \

diff --git a/src/network/networkd-wait-online-link.c b/src/network/wait-online/link.c
similarity index 98%
rename from src/network/networkd-wait-online-link.c
rename to src/network/wait-online/link.c
index e63ba07e909525bf0ead0d03f427a14f287193af..bd8578cf93018b5ff37167163b8568c25f2d0d93 100644 (file)
--- a/src/network/networkd-wait-online-link.c
+++ b/src/network/wait-online/link.c
@@ -21,7 +21,9 @@
 #include "sd-network.h"
 
 #include "alloc-util.h"
-#include "networkd-wait-online-link.h"
+#include "hashmap.h"
+#include "link.h"
+#include "manager.h"
 #include "string-util.h"
 
 int link_new(Manager *m, Link **ret, int ifindex, const char *ifname) {

diff --git a/src/network/networkd-wait-online-link.h b/src/network/wait-online/link.h
similarity index 95%
rename from src/network/networkd-wait-online-link.h
rename to src/network/wait-online/link.h
index dc35085c55d99bf11a2f9ccff962cae57edcf60b..c846e60c45071d3942492e0ee13eca085e51b7bd 100644 (file)
--- a/src/network/networkd-wait-online-link.h
+++ b/src/network/wait-online/link.h
@@ -20,9 +20,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-typedef struct Link Link;
+#include "sd-netlink.h"
 
-#include "networkd-wait-online.h"
+typedef struct Link Link;
+typedef struct Manager Manager;
 
 struct Link {
         Manager *manager;

diff --git a/src/network/networkd-wait-online-manager.c b/src/network/wait-online/manager.c
similarity index 99%
rename from src/network/networkd-wait-online-manager.c
rename to src/network/wait-online/manager.c
index 725b3310dd8b2bcd88636566a5e6f95044acbb7c..d51b0a59d6e3bf9d10b2f156ad5df2c710d0da46 100644 (file)
--- a/src/network/networkd-wait-online-manager.c
+++ b/src/network/wait-online/manager.c
@@ -22,10 +22,10 @@
 #include <fnmatch.h>
 
 #include "alloc-util.h"
+#include "link.h"
+#include "manager.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"
 

diff --git a/src/network/networkd-wait-online.h b/src/network/wait-online/manager.h
similarity index 97%
rename from src/network/networkd-wait-online.h
rename to src/network/wait-online/manager.h
index f91995c3069c8f789003a99d3912729bd43be022..052f6b9780e1ca2277ef23d4d914f9773eb7bbe5 100644 (file)
--- a/src/network/networkd-wait-online.h
+++ b/src/network/wait-online/manager.h
@@ -26,8 +26,7 @@
 #include "hashmap.h"
 
 typedef struct Manager Manager;
-
-#include "networkd-wait-online-link.h"
+typedef struct Link Link;
 
 struct Manager {
         Hashmap *links;

diff --git a/src/network/networkd-wait-online.c b/src/network/wait-online/wait-online.c
similarity index 99%
rename from src/network/networkd-wait-online.c
rename to src/network/wait-online/wait-online.c
index 3220c4b7efb46db84e8c537ae2beb830e1b4ede2..268cbdb6297877796e044e700c325b5eb5d41266 100644 (file)
--- a/src/network/networkd-wait-online.c
+++ b/src/network/wait-online/wait-online.c
@@ -22,7 +22,7 @@
 
 #include "sd-daemon.h"
 
-#include "networkd-wait-online.h"
+#include "manager.h"
 #include "signal-util.h"
 #include "strv.h"