diff options
| author | Ronny Chevalier <chevalier.ronny@gmail.com> | 2014-10-11 18:45:11 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-10-21 00:38:30 +0200 |
| commit | e4746b57387ffaf8be01c177ed4bbf02c8088341 (patch) | |
| tree | 12d3f25f511a05c381005f5d08a2585071efb0bd | |
| parent | 6dab5bb18151c80fc39bd51f03dcff40b920de3e (diff) | |
util: avoid duplication of TIME_T_MAX
| -rw-r--r-- | src/core/manager.c | 3 | ||||
| -rw-r--r-- | src/shared/time-util.h | 2 | ||||
| -rw-r--r-- | src/timesync/timesyncd-manager.c | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/core/manager.c b/src/core/manager.c index 726977fcf..1a5d252d3 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -75,6 +75,7 @@ #include "dbus-job.h" #include "dbus-manager.h" #include "bus-kernel.h" +#include "time-util.h" /* As soon as 5s passed since a unit was added to our GC queue, make sure to run a gc sweep */ #define GC_QUEUE_USEC_MAX (10*USEC_PER_SEC) @@ -84,8 +85,6 @@ #define JOBS_IN_PROGRESS_PERIOD_USEC (USEC_PER_SEC / 3) #define JOBS_IN_PROGRESS_PERIOD_DIVISOR 3 -#define TIME_T_MAX (time_t)((1UL << ((sizeof(time_t) << 3) - 1)) - 1) - static int manager_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t revents, void *userdata); static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t revents, void *userdata); static int manager_dispatch_time_change_fd(sd_event_source *source, int fd, uint32_t revents, void *userdata); diff --git a/src/shared/time-util.h b/src/shared/time-util.h index 05369d295..b55a660bb 100644 --- a/src/shared/time-util.h +++ b/src/shared/time-util.h @@ -65,6 +65,8 @@ typedef struct dual_timestamp { #define FORMAT_TIMESTAMP_RELATIVE_MAX 256 #define FORMAT_TIMESPAN_MAX 64 +#define TIME_T_MAX (time_t)((1UL << ((sizeof(time_t) << 3) - 1)) - 1) + #define DUAL_TIMESTAMP_NULL ((struct dual_timestamp) { 0, 0 }) usec_t now(clockid_t clock); diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c index 46f8bd6d8..e5b156b7d 100644 --- a/src/timesync/timesyncd-manager.c +++ b/src/timesync/timesyncd-manager.c @@ -54,8 +54,7 @@ #include "mkdir.h" #include "timesyncd-conf.h" #include "timesyncd-manager.h" - -#define TIME_T_MAX (time_t)((1UL << ((sizeof(time_t) << 3) - 1)) - 1) +#include "time-util.h" #ifndef ADJ_SETOFFSET #define ADJ_SETOFFSET 0x0100 /* add 'time' to current time */ |