diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2020-12-17 20:53:43 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2020-12-17 20:53:43 +0100 |
| commit | 251e08ffa626d4b7c7e5f626aee7067b86b2ceba (patch) | |
| tree | 8309b7b739737d41e564fa9c969871eb9ad46613 | |
| parent | a4c5cb2335dc3ef2fd21560c2205abf1e484e82a (diff) | |
| download | busybox-w32-251e08ffa626d4b7c7e5f626aee7067b86b2ceba.tar.gz busybox-w32-251e08ffa626d4b7c7e5f626aee7067b86b2ceba.tar.bz2 busybox-w32-251e08ffa626d4b7c7e5f626aee7067b86b2ceba.zip | |
move ADJTIME_PATH define to header files
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | include/rtc_.h | 6 | ||||
| -rw-r--r-- | include/usage.src.h | 6 | ||||
| -rw-r--r-- | libbb/rtc.c | 6 | ||||
| -rw-r--r-- | util-linux/hwclock.c | 5 | ||||
| -rw-r--r-- | util-linux/rtcwake.c | 5 |
5 files changed, 12 insertions, 16 deletions
diff --git a/include/rtc_.h b/include/rtc_.h index 750fc20ec..24ff5363f 100644 --- a/include/rtc_.h +++ b/include/rtc_.h | |||
| @@ -11,6 +11,12 @@ | |||
| 11 | 11 | ||
| 12 | PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN | 12 | PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN |
| 13 | 13 | ||
| 14 | #if ENABLE_FEATURE_HWCLOCK_ADJTIME_FHS | ||
| 15 | # define ADJTIME_PATH "/var/lib/hwclock/adjtime" | ||
| 16 | #else | ||
| 17 | # define ADJTIME_PATH "/etc/adjtime" | ||
| 18 | #endif | ||
| 19 | |||
| 14 | int rtc_adjtime_is_utc(void) FAST_FUNC; | 20 | int rtc_adjtime_is_utc(void) FAST_FUNC; |
| 15 | int rtc_xopen(const char **default_rtc, int flags) FAST_FUNC; | 21 | int rtc_xopen(const char **default_rtc, int flags) FAST_FUNC; |
| 16 | void rtc_read_tm(struct tm *ptm, int fd) FAST_FUNC; | 22 | void rtc_read_tm(struct tm *ptm, int fd) FAST_FUNC; |
diff --git a/include/usage.src.h b/include/usage.src.h index d22efd3ba..1ac252d1b 100644 --- a/include/usage.src.h +++ b/include/usage.src.h | |||
| @@ -25,6 +25,12 @@ | |||
| 25 | " (default "CONFIG_FEATURE_DEFAULT_PASSWD_ALGO")" | 25 | " (default "CONFIG_FEATURE_DEFAULT_PASSWD_ALGO")" |
| 26 | #endif | 26 | #endif |
| 27 | 27 | ||
| 28 | #if ENABLE_FEATURE_HWCLOCK_ADJTIME_FHS | ||
| 29 | # define ADJTIME_PATH "/var/lib/hwclock/adjtime" | ||
| 30 | #else | ||
| 31 | # define ADJTIME_PATH "/etc/adjtime" | ||
| 32 | #endif | ||
| 33 | |||
| 28 | INSERT | 34 | INSERT |
| 29 | 35 | ||
| 30 | #define busybox_notes_usage \ | 36 | #define busybox_notes_usage \ |
diff --git a/libbb/rtc.c b/libbb/rtc.c index c4117ba34..54b52f23a 100644 --- a/libbb/rtc.c +++ b/libbb/rtc.c | |||
| @@ -7,12 +7,6 @@ | |||
| 7 | #include "libbb.h" | 7 | #include "libbb.h" |
| 8 | #include "rtc_.h" | 8 | #include "rtc_.h" |
| 9 | 9 | ||
| 10 | #if ENABLE_FEATURE_HWCLOCK_ADJTIME_FHS | ||
| 11 | # define ADJTIME_PATH "/var/lib/hwclock/adjtime" | ||
| 12 | #else | ||
| 13 | # define ADJTIME_PATH "/etc/adjtime" | ||
| 14 | #endif | ||
| 15 | |||
| 16 | int FAST_FUNC rtc_adjtime_is_utc(void) | 10 | int FAST_FUNC rtc_adjtime_is_utc(void) |
| 17 | { | 11 | { |
| 18 | int utc = 0; | 12 | int utc = 0; |
diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c index dd66ec199..25db7cdad 100644 --- a/util-linux/hwclock.c +++ b/util-linux/hwclock.c | |||
| @@ -344,11 +344,6 @@ static void from_sys_clock(const char **pp_rtcname, int utc) | |||
| 344 | // --test dry run; implies --verbose | 344 | // --test dry run; implies --verbose |
| 345 | // -v, --verbose display more details | 345 | // -v, --verbose display more details |
| 346 | 346 | ||
| 347 | //usage:#if ENABLE_FEATURE_HWCLOCK_ADJTIME_FHS | ||
| 348 | //usage:# define ADJTIME_PATH "/var/lib/hwclock/adjtime" | ||
| 349 | //usage:#else | ||
| 350 | //usage:# define ADJTIME_PATH "/etc/adjtime" | ||
| 351 | //usage:#endif | ||
| 352 | //usage:#define hwclock_trivial_usage | 347 | //usage:#define hwclock_trivial_usage |
| 353 | //usage: IF_LONG_OPTS( | 348 | //usage: IF_LONG_OPTS( |
| 354 | //usage: "[-swul] [--systz] [-f DEV]" | 349 | //usage: "[-swul] [--systz] [-f DEV]" |
diff --git a/util-linux/rtcwake.c b/util-linux/rtcwake.c index be7e95099..eac16077d 100644 --- a/util-linux/rtcwake.c +++ b/util-linux/rtcwake.c | |||
| @@ -32,11 +32,6 @@ | |||
| 32 | 32 | ||
| 33 | //kbuild:lib-$(CONFIG_RTCWAKE) += rtcwake.o | 33 | //kbuild:lib-$(CONFIG_RTCWAKE) += rtcwake.o |
| 34 | 34 | ||
| 35 | //usage:#if ENABLE_FEATURE_HWCLOCK_ADJTIME_FHS | ||
| 36 | //usage:# define ADJTIME_PATH "/var/lib/hwclock/adjtime" | ||
| 37 | //usage:#else | ||
| 38 | //usage:# define ADJTIME_PATH "/etc/adjtime" | ||
| 39 | //usage:#endif | ||
| 40 | //usage:#define rtcwake_trivial_usage | 35 | //usage:#define rtcwake_trivial_usage |
| 41 | //usage: "[-a | -l | -u] [-d DEV] [-m MODE] [-s SEC | -t TIME]" | 36 | //usage: "[-a | -l | -u] [-d DEV] [-m MODE] [-s SEC | -t TIME]" |
| 42 | //usage:#define rtcwake_full_usage "\n\n" | 37 | //usage:#define rtcwake_full_usage "\n\n" |
