diff options
| -rw-r--r-- | sys-utils/hwclock-cmos.c | 2 | ||||
| -rw-r--r-- | sys-utils/hwclock-rtc.c | 12 | ||||
| -rw-r--r-- | sys-utils/hwclock.c | 10 |
3 files changed, 4 insertions, 20 deletions
diff --git a/sys-utils/hwclock-cmos.c b/sys-utils/hwclock-cmos.c index 9d9a42a8b..6595725fd 100644 --- a/sys-utils/hwclock-cmos.c +++ b/sys-utils/hwclock-cmos.c @@ -269,7 +269,7 @@ void set_cmos_access(const struct hwclock_control *ctl) } #endif /* __alpha */ -#if __alpha__ +#ifdef __alpha__ /* * The Alpha doesn't allow user-level code to disable interrupts (for good * reasons). Instead, we ensure atomic operation by performing the operation diff --git a/sys-utils/hwclock-rtc.c b/sys-utils/hwclock-rtc.c index 8dd47092f..b974cc2aa 100644 --- a/sys-utils/hwclock-rtc.c +++ b/sys-utils/hwclock-rtc.c @@ -53,18 +53,6 @@ struct sparc_rtc_time #define RTCGET _IOR('p', 20, struct sparc_rtc_time) #define RTCSET _IOW('p', 21, struct sparc_rtc_time) -/* non-sparc stuff */ -#if 0 -# include <linux/version.h> -/* - * Check if the /dev/rtc interface is available in this version of the - * system headers. 131072 is linux 2.0.0. - */ -# if LINUX_VERSION_CODE >= 131072 -# include <linux/mc146818rtc.h> -# endif -#endif - /* * struct rtc_time is present since 1.3.99. * Earlier (since 1.3.89), a struct tm was used. diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c index fc476c088..b08bd781a 100644 --- a/sys-utils/hwclock.c +++ b/sys-utils/hwclock.c @@ -972,7 +972,7 @@ adjust_drift_factor(const struct hwclock_control *ctl, printf(_("Not adjusting drift factor because it has " "been less than four hours since the last " "calibration.\n")); - } else if (adjtime_p->last_calib_time != 0) { + } else { /* * At adjustment time we drift correct the hardware clock * according to the contents of the adjtime file and refresh @@ -1221,8 +1221,6 @@ static int manipulate_clock(const struct hwclock_control *ctl, const time_t set_time, const struct timeval startup_time, struct adjtime *adjtime) { - /* Set if user lacks necessary authorization to access the clock */ - bool no_auth; /* The time at which we read the Hardware Clock */ struct timeval read_time; /* @@ -1240,11 +1238,9 @@ manipulate_clock(const struct hwclock_control *ctl, const time_t set_time, /* local return code */ int rc = 0; - if (!ctl->systz && !ctl->predict) { - no_auth = ur->get_permissions(); - if (no_auth) + if (!ctl->systz && !ctl->predict) + if (ur->get_permissions()) return EX_NOPERM; - } if ((ctl->set || ctl->systohc || ctl->adjust) && (adjtime->local_utc == UTC) != ctl->universal) { |