timesyncd: merge some variable declarations

diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c
index 60be465caa938f9c1aadba0bff68199710a4052e..4781fcadc13d532a6facd28bbeebc468915a8ca3 100644 (file)
--- a/src/timesync/timesyncd-manager.c
+++ b/src/timesync/timesyncd-manager.c
@@ -425,12 +425,9 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re
         struct cmsghdr *cmsg;
         struct timespec *recv_time = NULL;
         ssize_t len;
-        double origin, receive, trans, dest;
-        double delay, offset;
-        double root_distance;
+        double origin, receive, trans, dest, delay, offset, root_distance;
         bool spike;
-        int leap_sec;
-        int r;
+        int leap_sec, r;
 
         assert(source);
         assert(m);

diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c
index 98766a9ce7ded27acee234466a4e3af4a7e66721..999d1d385237834d1a99fdd5e08d7e7accc8429e 100644 (file)
--- a/src/timesync/timesyncd.c
+++ b/src/timesync/timesyncd.c
@@ -22,9 +22,8 @@
 #include "user-util.h"
 
 static int load_clock_timestamp(uid_t uid, gid_t gid) {
+        usec_t min = TIME_EPOCH * USEC_PER_SEC, ct;
         _cleanup_close_ int fd = -1;
-        usec_t min = TIME_EPOCH * USEC_PER_SEC;
-        usec_t ct;
         int r;
 
         /* Let's try to make sure that the clock is always