Sfoglia il codice sorgente

move ADJTIME_PATH define to header files

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Denys Vlasenko 3 anni fa
parent
commit
251e08ffa6
5 ha cambiato i file con 12 aggiunte e 16 eliminazioni
  1. 6 0
      include/rtc_.h
  2. 6 0
      include/usage.src.h
  3. 0 6
      libbb/rtc.c
  4. 0 5
      util-linux/hwclock.c
  5. 0 5
      util-linux/rtcwake.c

+ 6 - 0
include/rtc_.h

@@ -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;

+ 6 - 0
include/usage.src.h

@@ -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 \

+ 0 - 6
libbb/rtc.c

@@ -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;

+ 0 - 5
util-linux/hwclock.c

@@ -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]"

+ 0 - 5
util-linux/rtcwake.c

@@ -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"