summaryrefslogtreecommitdiff
path: root/src/timesync
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2022-03-18 16:55:29 +0100
committerLennart Poettering <lennart@poettering.net>2022-03-18 23:53:24 +0100
commit5ba674cca59bed9d58eaf06271c8efe5f17fe4cb (patch)
treeae3b783325cc7c2e3eb08ccd78f7025648e72c28 /src/timesync
parent9a8b43021b7e6712bade0d57bbe0d03e96ce65b3 (diff)
downloadsystemd-5ba674cca59bed9d58eaf06271c8efe5f17fe4cb.tar.gz
timesyncd: merge some variable declarations
Diffstat (limited to 'src/timesync')
-rw-r--r--src/timesync/timesyncd-manager.c7
-rw-r--r--src/timesync/timesyncd.c3
2 files changed, 3 insertions, 7 deletions
diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c
index 60be465caa..4781fcadc1 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 98766a9ce7..999d1d3852 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