From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 18 Mar 2022 15:55:29 +0000 (+0100)
Subject: timesyncd: merge some variable declarations
X-Git-Tag: v251-rc1~92^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ba674cca59bed9d58eaf06271c8efe5f17fe4cb;p=thirdparty%2Fsystemd.git

timesyncd: merge some variable declarations
---

diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c
index 60be465caa9..4781fcadc13 100644
--- 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 98766a9ce7d..999d1d38523 100644
--- 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