Prep v220: Fix src/basic/time-util.h, unmask timezone_is_valid, mask unneeded functions.

diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index 15185a2bb3e565222777e0e84a050c82cb00ca70..52a0382c74b385ffadf3644add040e8bea2592d7 100644 (file)
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -37,6 +37,8 @@ usec_t now(clockid_t clock_id) {
         return timespec_load(&ts);
 }
 
+/// UNNEEDED by elogind
+#if 0
 nsec_t now_nsec(clockid_t clock_id) {
         struct timespec ts;
 
@@ -44,6 +46,7 @@ nsec_t now_nsec(clockid_t clock_id) {
 
         return timespec_load_nsec(&ts);
 }
+#endif // 0
 
 dual_timestamp* dual_timestamp_get(dual_timestamp *ts) {
         assert(ts);
@@ -98,7 +101,6 @@ dual_timestamp* dual_timestamp_from_monotonic(dual_timestamp *ts, usec_t u) {
 
         return ts;
 }
-#endif // 0
 
 dual_timestamp* dual_timestamp_from_boottime_or_monotonic(dual_timestamp *ts, usec_t u) {
         int64_t delta;
@@ -124,7 +126,7 @@ dual_timestamp* dual_timestamp_from_boottime_or_monotonic(dual_timestamp *ts, us
 
         return ts;
 }
-
+#endif // 0
 
 usec_t timespec_load(const struct timespec *ts) {
         assert(ts);
@@ -1000,6 +1002,7 @@ int get_timezones(char ***ret) {
 
         return 0;
 }
+#endif // 0
 
 bool timezone_is_valid(const char *name) {
         bool slash = false;
@@ -1041,7 +1044,6 @@ bool timezone_is_valid(const char *name) {
 
         return true;
 }
-#endif // 0
 
 clockid_t clock_boottime_or_monotonic(void) {
         static clockid_t clock = -1;

diff --git a/src/basic/time-util.h b/src/basic/time-util.h
index 9cd6949b2c345693b02a6a438c294ca776d51ec1..08b2bfb82bd8ec00743ec40bd104236dcceb2118 100644 (file)
--- a/src/basic/time-util.h
+++ b/src/basic/time-util.h
@@ -70,11 +70,12 @@ typedef struct dual_timestamp {
 #define DUAL_TIMESTAMP_NULL ((struct dual_timestamp) { 0ULL, 0ULL })
 
 usec_t now(clockid_t clock);
+// UNNEEDED nsec_t now_nsec(clockid_t clock);
 
 dual_timestamp* dual_timestamp_get(dual_timestamp *ts);
 dual_timestamp* dual_timestamp_from_realtime(dual_timestamp *ts, usec_t u);
 // UNNEEDED dual_timestamp* dual_timestamp_from_monotonic(dual_timestamp *ts, usec_t u);
-dual_timestamp* dual_timestamp_from_boottime_or_monotonic(dual_timestamp *ts, usec_t u);
+// UNNEEDED dual_timestamp* dual_timestamp_from_boottime_or_monotonic(dual_timestamp *ts, usec_t u);
 
 static inline bool dual_timestamp_is_set(dual_timestamp *ts) {
         return ((ts->realtime > 0 && ts->realtime != USEC_INFINITY) ||
@@ -107,7 +108,7 @@ int parse_nsec(const char *t, nsec_t *nsec);
 // UNNEEDED bool ntp_synced(void);
 
 // UNNEEDED int get_timezones(char ***l);
-// UNNEEDED bool timezone_is_valid(const char *name);
+bool timezone_is_valid(const char *name);
 
 clockid_t clock_boottime_or_monotonic(void);