emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move ADJTIME_PATH define to header files

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2020-12-17 20:53:43 +01:00
parent a4c5cb2335
commit 251e08ffa6
5 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/rtc_.h
View File

@ -11,6 +11,12 @@
PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN 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_adjtime_is_utc(void) FAST_FUNC;
int rtc_xopen(const char **default_rtc, int flags) FAST_FUNC; int rtc_xopen(const char **default_rtc, int flags) FAST_FUNC;
void rtc_read_tm(struct tm *ptm, int fd) FAST_FUNC; void rtc_read_tm(struct tm *ptm, int fd) FAST_FUNC;

6
include/usage.src.h
View File

@ -25,6 +25,12 @@
" (default "CONFIG_FEATURE_DEFAULT_PASSWD_ALGO")" " (default "CONFIG_FEATURE_DEFAULT_PASSWD_ALGO")"
#endif #endif
#if ENABLE_FEATURE_HWCLOCK_ADJTIME_FHS
# define ADJTIME_PATH "/var/lib/hwclock/adjtime"
#else
# define ADJTIME_PATH "/etc/adjtime"
#endif
INSERT INSERT
#define busybox_notes_usage \ #define busybox_notes_usage \

6
libbb/rtc.c
View File

@ -7,12 +7,6 @@
#include "libbb.h" #include "libbb.h"
#include "rtc_.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 FAST_FUNC rtc_adjtime_is_utc(void)
{ {
int utc = 0; int utc = 0;

5
util-linux/hwclock.c
View File

@ -344,11 +344,6 @@ static void from_sys_clock(const char **pp_rtcname, int utc)
// --test dry run; implies --verbose // --test dry run; implies --verbose
// -v, --verbose display more details // -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:#define hwclock_trivial_usage
//usage: IF_LONG_OPTS( //usage: IF_LONG_OPTS(
//usage: "[-swul] [--systz] [-f DEV]" //usage: "[-swul] [--systz] [-f DEV]"

5
util-linux/rtcwake.c
View File

@ -32,11 +32,6 @@
//kbuild:lib-$(CONFIG_RTCWAKE) += rtcwake.o //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:#define rtcwake_trivial_usage
//usage: "[-a | -l | -u] [-d DEV] [-m MODE] [-s SEC | -t TIME]" //usage: "[-a | -l | -u] [-d DEV] [-m MODE] [-s SEC | -t TIME]"
//usage:#define rtcwake_full_usage "\n\n" //usage:#define rtcwake_full_usage "\n\n"