]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
timesync: changes type of drift_freq to int64_t
authorYu Watanabe <watanabe.yu+github@gmail.com>
Sat, 23 Jun 2018 00:41:55 +0000 (09:41 +0900)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 25 Jun 2018 08:27:18 +0000 (10:27 +0200)
drift_freq is used for storing timex.freq, and is a 64bit integer.
To support x32 ABI, this changes the type of drift_freq to int64_t.

Fixes #9387.

src/timesync/timesyncd-manager.c
src/timesync/timesyncd-manager.h

index 2b731af9e3f1bc3ba6ce6765fd64b7dbc6c2343b..404a2b18943ac2fcfaece3c66722a73b2ed36c6e 100644 (file)
@@ -604,7 +604,7 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re
         m->dest_time = *recv_time;
         m->spike = spike;
 
-        log_debug("interval/delta/delay/jitter/drift " USEC_FMT "s/%+.3fs/%.3fs/%.3fs/%+"PRI_TIMEX"ppm%s",
+        log_debug("interval/delta/delay/jitter/drift " USEC_FMT "s/%+.3fs/%.3fs/%.3fs/%+"PRIi64"ppm%s",
                   m->poll_interval_usec / USEC_PER_SEC, offset, delay, m->samples_jitter, m->drift_freq / 65536,
                   spike ? " (ignored)" : "");
 
index d8d97cc1ee9383321155e460ef34f5556d090a9c..18347416d14fd8b1f07238925afd71f8e8253c6c 100644 (file)
@@ -79,7 +79,7 @@ struct Manager {
         /* last change */
         bool jumped;
         bool sync;
-        long drift_freq;
+        int64_t drift_freq;
 
         /* watch for time changes */
         sd_event_source *event_clock_watch;