251e08ffa
Denys Vlasenko
2020-12-17
Subject
move ADJTIME_PATH define to header files
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/rtc_.h +6 -0include/usage.src.h +6 -0libbb/rtc.c +0 -6util-linux/hwclock.c +0 -5util-linux/rtcwake.c +0 -5
include/rtc_.h+6 -0
| @@ -11,6 +11,12 @@ | |
| PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN | |
| + | #if ENABLE_FEATURE_HWCLOCK_ADJTIME_FHS |
| + | # define ADJTIME_PATH "/var/lib/hwclock/adjtime" |
| + | #else |
| + | # define ADJTIME_PATH "/etc/adjtime" |
| + | #endif |
| + | |
| int rtc_adjtime_is_utc(void) FAST_FUNC; | |
| int rtc_xopen(const char **default_rtc, int flags) FAST_FUNC; | |
| void rtc_read_tm(struct tm *ptm, int fd) FAST_FUNC; | |
include/usage.src.h+6 -0
| @@ -25,6 +25,12 @@ | |
| " (default "CONFIG_FEATURE_DEFAULT_PASSWD_ALGO")" | |
| #endif | |
| + | #if ENABLE_FEATURE_HWCLOCK_ADJTIME_FHS |
| + | # define ADJTIME_PATH "/var/lib/hwclock/adjtime" |
| + | #else |
| + | # define ADJTIME_PATH "/etc/adjtime" |
| + | #endif |
| + | |
| INSERT | |
| #define busybox_notes_usage \ | |
libbb/rtc.c+0 -6
| @@ -7,12 +7,6 @@ | |
| #include "libbb.h" | |
| #include "rtc_.h" | |
| - | #if ENABLE_FEATURE_HWCLOCK_ADJTIME_FHS |
| - | # define ADJTIME_PATH "/var/lib/hwclock/adjtime" |
| - | #else |
| - | # define ADJTIME_PATH "/etc/adjtime" |
| - | #endif |
| - | |
| int FAST_FUNC rtc_adjtime_is_utc(void) | |
| { | |
| int utc = 0; | |
util-linux/hwclock.c+0 -5
| @@ -344,11 +344,6 @@ static void from_sys_clock(const char **pp_rtcname, int utc) | |
| // --test dry run; implies --verbose | |
| // -v, --verbose display more details | |
| - | //usage:#if ENABLE_FEATURE_HWCLOCK_ADJTIME_FHS |
| - | //usage:# define ADJTIME_PATH "/var/lib/hwclock/adjtime" |
| - | //usage:#else |
| - | //usage:# define ADJTIME_PATH "/etc/adjtime" |
| - | //usage:#endif |
| //usage:#define hwclock_trivial_usage | |
| //usage: IF_LONG_OPTS( | |
| //usage: "[-swul] [--systz] [-f DEV]" | |
util-linux/rtcwake.c+0 -5
| @@ -32,11 +32,6 @@ | |
| //kbuild:lib-$(CONFIG_RTCWAKE) += rtcwake.o | |
| - | //usage:#if ENABLE_FEATURE_HWCLOCK_ADJTIME_FHS |
| - | //usage:# define ADJTIME_PATH "/var/lib/hwclock/adjtime" |
| - | //usage:#else |
| - | //usage:# define ADJTIME_PATH "/etc/adjtime" |
| - | //usage:#endif |
| //usage:#define rtcwake_trivial_usage | |
| //usage: "[-a | -l | -u] [-d DEV] [-m MODE] [-s SEC | -t TIME]" | |
| //usage:#define rtcwake_full_usage "\n\n" | |