diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-05-12 09:39:28 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-05-12 12:05:21 +0200 |
commit | 8f0ea0efd9342e98c90189edb79b3a2bfdf77a8a (patch) | |
tree | 4027c72d06ee720347cbf5cfea2a9e8c9bbff58c /src | |
parent | 8f7123731d2a269ee9985cc265b6e69af63c1b6b (diff) | |
download | systemd-8f0ea0efd9342e98c90189edb79b3a2bfdf77a8a.tar.gz |
timedated: make ntp_synced() static
No need to have this in basic.
Diffstat (limited to 'src')
-rw-r--r-- | src/basic/time-util.c | 16 | ||||
-rw-r--r-- | src/basic/time-util.h | 2 | ||||
-rw-r--r-- | src/timedate/timedated.c | 13 |
3 files changed, 13 insertions, 18 deletions
diff --git a/src/basic/time-util.c b/src/basic/time-util.c index 6b3b42254d..b6087c4550 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c @@ -7,7 +7,6 @@ #include <sys/mman.h> #include <sys/time.h> #include <sys/timerfd.h> -#include <sys/timex.h> #include <sys/types.h> #include <unistd.h> @@ -1245,21 +1244,6 @@ int parse_nsec(const char *t, nsec_t *nsec) { return 0; } -bool ntp_synced(void) { - struct timex txc = {}; - - if (adjtimex(&txc) < 0) - return false; - - /* Consider the system clock synchronized if the reported maximum error is smaller than the maximum - * value (16 seconds). Ignore the STA_UNSYNC flag as it may have been set to prevent the kernel from - * touching the RTC. */ - if (txc.maxerror >= 16000000) - return false; - - return true; -} - int get_timezones(char ***ret) { _cleanup_fclose_ FILE *f = NULL; _cleanup_strv_free_ char **zones = NULL; diff --git a/src/basic/time-util.h b/src/basic/time-util.h index d716074fbe..cfde189818 100644 --- a/src/basic/time-util.h +++ b/src/basic/time-util.h @@ -133,8 +133,6 @@ int parse_sec_def_infinity(const char *t, usec_t *usec); int parse_time(const char *t, usec_t *usec, usec_t default_unit); int parse_nsec(const char *t, nsec_t *nsec); -bool ntp_synced(void); - int get_timezones(char ***l); bool timezone_is_valid(const char *name, int log_level); diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c index 6e0f91dec4..66b454269d 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c @@ -2,6 +2,7 @@ #include <errno.h> #include <sys/stat.h> +#include <sys/timex.h> #include <sys/types.h> #include <unistd.h> @@ -556,6 +557,18 @@ static int unit_enable_or_disable(UnitStatusInfo *u, sd_bus *bus, sd_bus_error * return 0; } +static bool ntp_synced(void) { + struct timex txc = {}; + + if (adjtimex(&txc) < 0) + return false; + + /* Consider the system clock synchronized if the reported maximum error is smaller than the maximum + * value (16 seconds). Ignore the STA_UNSYNC flag as it may have been set to prevent the kernel from + * touching the RTC. */ + return txc.maxerror < 16000000; +} + static BUS_DEFINE_PROPERTY_GET_GLOBAL(property_get_time, "t", now(CLOCK_REALTIME)); static BUS_DEFINE_PROPERTY_GET_GLOBAL(property_get_ntp_sync, "b", ntp_synced()); |