X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fhwclock.c;h=488c30e93f6c8ce04dfb2da451b4c60022b0c9c4;hb=9f26c90cb50c45d4549c4dd569917b4ac143b94d;hp=0e8fa45971325704640a701af5666d8e50c76684;hpb=4eeebf70aa5ac9825899f5a063431329904d37e5;p=elogind.git diff --git a/src/shared/hwclock.c b/src/shared/hwclock.c index 0e8fa4597..488c30e93 100644 --- a/src/shared/hwclock.c +++ b/src/shared/hwclock.c @@ -41,6 +41,7 @@ #include "log.h" #include "strv.h" #include "hwclock.h" +#include "fileio.h" static int rtc_open(int flags) { int fd; @@ -199,14 +200,14 @@ int hwclock_set_timezone(int *min) { const struct timeval *tv_null = NULL; struct timespec ts; struct tm *tm; - int minuteswest; + int minutesdelta; struct timezone tz; assert_se(clock_gettime(CLOCK_REALTIME, &ts) == 0); assert_se(tm = localtime(&ts.tv_sec)); - minuteswest = tm->tm_gmtoff / 60; + minutesdelta = tm->tm_gmtoff / 60; - tz.tz_minuteswest = -minuteswest; + tz.tz_minuteswest = -minutesdelta; tz.tz_dsttime = 0; /* DST_NONE*/ /* @@ -217,7 +218,7 @@ int hwclock_set_timezone(int *min) { if (settimeofday(tv_null, &tz) < 0) return -errno; if (min) - *min = minuteswest; + *min = minutesdelta; return 0; }