timesync: Remove circular header dependencies

diff --git a/src/timesync/test-timesync.c b/src/timesync/test-timesync.c
index 7993e4c12bc0a47b1f35a9c9ce5ec6dbb53dae9b..160685b6d4e43faa188029de9b7264a6c9fb00f1 100644 (file)
--- a/src/timesync/test-timesync.c
+++ b/src/timesync/test-timesync.c
@@ -5,6 +5,8 @@
 #include "log.h"
 #include "macro.h"
 #include "timesyncd-conf.h"
+#include "timesyncd-manager.h"
+#include "timesyncd-server.h"
 #include "tests.h"
 
 TEST(manager_parse_string) {

diff --git a/src/timesync/timesyncd-bus.c b/src/timesync/timesyncd-bus.c
index a3be1e2ef97afd8ccbe05ff0563ee88352234237..2c780f1d17ed3aba15246a6598c359a1f845db6f 100644 (file)
--- a/src/timesync/timesyncd-bus.c
+++ b/src/timesync/timesyncd-bus.c
@@ -18,6 +18,8 @@
 #include "strv.h"
 #include "time-util.h"
 #include "timesyncd-bus.h"
+#include "timesyncd-manager.h"
+#include "timesyncd-server.h"
 #include "user-util.h"
 
 static int property_get_servers(

diff --git a/src/timesync/timesyncd-bus.h b/src/timesync/timesyncd-bus.h
index b2b5a2b30e839788fa2353e224be598814cab493..4ad25a0a6a74dd6514ad9b1ea45b08d48738c24b 100644 (file)
--- a/src/timesync/timesyncd-bus.h
+++ b/src/timesync/timesyncd-bus.h
@@ -2,7 +2,8 @@
 #pragma once
 
 #include "bus-object.h"
-#include "timesyncd-manager.h"
+
+typedef struct Manager Manager;
 
 extern const BusObjectImplementation manager_object;
 

diff --git a/src/timesync/timesyncd-conf.h b/src/timesync/timesyncd-conf.h
index d6b9060401c47d7c627fe5593e7915b30a1628b3..f0f1ab5cdf8e6d6b3e761c89e51acf0305446ca4 100644 (file)
--- a/src/timesync/timesyncd-conf.h
+++ b/src/timesync/timesyncd-conf.h
@@ -2,7 +2,9 @@
 #pragma once
 
 #include "conf-parser.h"
-#include "timesyncd-manager.h"
+#include "timesyncd-server.h"
+
+typedef struct Manager Manager;
 
 const struct ConfigPerfItem* timesyncd_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
 

diff --git a/src/timesync/timesyncd-gperf.gperf b/src/timesync/timesyncd-gperf.gperf
index 5543813f2d86f806db7b8b72dc397ca9352eb967..d1f18e9b6f290b267c96e96255fad2857667e17e 100644 (file)
--- a/src/timesync/timesyncd-gperf.gperf
+++ b/src/timesync/timesyncd-gperf.gperf
@@ -7,6 +7,8 @@ _Pragma("GCC diagnostic ignored \"-Wzero-as-null-pointer-constant\"")
 #include <stddef.h>
 #include "conf-parser.h"
 #include "timesyncd-conf.h"
+#include "timesyncd-manager.h"
+#include "timesyncd-server.h"
 %}
 struct ConfigPerfItem;
 %null_strings

diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c
index e7b962bc30a208bf91c2979033e22346e9a1aa97..4410b1626d0f0e810ca5aa4f297932efdfb8d0fc 100644 (file)
--- a/src/timesync/timesyncd-manager.c
+++ b/src/timesync/timesyncd-manager.c
@@ -35,6 +35,7 @@
 #include "time-util.h"
 #include "timesyncd-conf.h"
 #include "timesyncd-manager.h"
+#include "timesyncd-server.h"
 #include "user-util.h"
 
 #ifndef ADJ_SETOFFSET

diff --git a/src/timesync/timesyncd-manager.h b/src/timesync/timesyncd-manager.h
index 43dbef9417caba9e8198cfe3dd052879c3825cb6..371a7ca1118644d8bf169a72320007504823cad3 100644 (file)
--- a/src/timesync/timesyncd-manager.h
+++ b/src/timesync/timesyncd-manager.h
@@ -14,9 +14,9 @@
 #include "time-util.h"
 #include "timesyncd-ntp-message.h"
 
-typedef struct Manager Manager;
-
-#include "timesyncd-server.h"
+typedef enum ServerType ServerType;
+typedef struct ServerAddress ServerAddress;
+typedef struct ServerName ServerName;
 
 /*
  * "A client MUST NOT under any conditions use a poll interval less
@@ -32,7 +32,7 @@ typedef struct Manager Manager;
 
 #define DEFAULT_SAVE_TIME_INTERVAL_USEC (60 * USEC_PER_SEC)
 
-struct Manager {
+typedef struct Manager {
         sd_bus *bus;
         sd_event *event;
         sd_resolve *resolve;
@@ -116,7 +116,7 @@ struct Manager {
         /* Used to coalesce bus PropertiesChanged events */
         sd_event_source *deferred_ntp_server_event_source;
         unsigned ntp_server_change_mask;
-};
+} Manager;
 
 int manager_new(Manager **ret);
 Manager* manager_free(Manager *m);

diff --git a/src/timesync/timesyncd-server.c b/src/timesync/timesyncd-server.c
index ccaac3d32dfd4ae93e8b2e2e6104961d94d6b238..431c749c0fd906fbc611c090df6fd59fd1cade49 100644 (file)
--- a/src/timesync/timesyncd-server.c
+++ b/src/timesync/timesyncd-server.c
@@ -3,6 +3,7 @@
 #include "alloc-util.h"
 #include "log.h"
 #include "string-table.h"
+#include "timesyncd-manager.h"
 #include "timesyncd-server.h"
 
 static const char * const server_type_table[_SERVER_TYPE_MAX] = {

diff --git a/src/timesync/timesyncd-server.h b/src/timesync/timesyncd-server.h
index a4b56377312c6efffa30ba54a19f805508806551..dac74199ff04d55e681b47b3cc63b8a4ff9e3666 100644 (file)
--- a/src/timesync/timesyncd-server.h
+++ b/src/timesync/timesyncd-server.h
@@ -4,6 +4,7 @@
 #include "list.h"
 #include "socket-util.h"
 
+typedef struct Manager Manager;
 typedef struct ServerAddress ServerAddress;
 typedef struct ServerName ServerName;
 
@@ -16,8 +17,6 @@ typedef enum ServerType {
         _SERVER_TYPE_INVALID = -EINVAL,
 } ServerType;
 
-#include "timesyncd-manager.h"
-
 struct ServerAddress {
         ServerName *name;