include/pathnames: rename _PATH_ADJPATH to _PATH_ADJTIME

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/include/pathnames.h b/include/pathnames.h
index 6d300a9e759239b256bdd02e9538ab6b21496620..d7b36efcdaf8bd84313d062e7adf87dc18543816 100644 (file)
--- a/include/pathnames.h
+++ b/include/pathnames.h
@@ -139,7 +139,8 @@
 #define _PATH_DEV_BYPARTUUID   "/dev/disk/by-partuuid"
 
 /* hwclock paths */
-#define _PATH_ADJPATH          "/etc/adjtime"
+# define _PATH_ADJTIME         "/etc/adjtime"
+
 #define _PATH_LASTDATE         "/var/lib/lastdate"
 #ifdef __ia64__
 # define _PATH_RTC_DEV         "/dev/efirtc"

diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
index b7f569207a0c9c27d64114f019f633ae43ac0785..5dd7919ec3b12c4151f2d3374593e923fa088ba1 100644 (file)
--- a/sys-utils/hwclock.c
+++ b/sys-utils/hwclock.c
@@ -1476,7 +1476,7 @@ static void usage(const char *fmt, ...)
                "     --noadjfile      do not access %s; this requires the use of\n"
                "                        either --utc or --localtime\n"
                "     --adjfile <file> specifies the path to the adjust file;\n"
-               "                        the default is %s\n"), _PATH_ADJPATH, _PATH_ADJPATH);
+               "                        the default is %s\n"), _PATH_ADJTIME, _PATH_ADJTIME);
        fputs(_("     --test           do not update anything, just show what would happen\n"
                " -D, --debug          debugging mode\n" "\n"), usageto);
 #ifdef __alpha__
@@ -1746,7 +1746,7 @@ int main(int argc, char **argv)
        }
 
        if (!adj_file_name)
-               adj_file_name = _PATH_ADJPATH;
+               adj_file_name = _PATH_ADJTIME;
 
        if (noadjfile && !utc && !local_opt) {
                warnx(_("With --noadjfile, you must specify "

diff --git a/sys-utils/rtcwake.c b/sys-utils/rtcwake.c
index f233f506e6c03d2396a24f910e490aedc14a7dab..d7f193b05780c3ea795c0511e4745fd3af619cc5 100644 (file)
--- a/sys-utils/rtcwake.c
+++ b/sys-utils/rtcwake.c
@@ -60,7 +60,7 @@ enum ClockMode {
        CM_LOCAL
 };
 
-static char            *adjfile = _PATH_ADJPATH;
+static char            *adjfile = _PATH_ADJTIME;
 static unsigned                verbose;
 static unsigned                dryrun;
 enum ClockMode         clock_mode = CM_AUTO;
@@ -74,7 +74,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
        fputs(USAGE_OPTIONS, out);
        fprintf(out,
              _(" -A, --adjfile <file>     specifies the path to the adjust file\n"
-               "                            the default is %s\n"), _PATH_ADJPATH);
+               "                            the default is %s\n"), _PATH_ADJTIME);
        fputs(_(" -d, --device <device>    select rtc device (rtc0|rtc1|...)\n"
                " -n, --dry-run            does everything, but suspend\n"
                " -l, --local              RTC uses local timezone\n"