summaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDenys Vlasenko2010-01-06 22:43:39 +0100
committerDenys Vlasenko2010-01-06 22:43:39 +0100
commit5e3b14069e3fe25ec2595124e6e0103c7be4f813 (patch)
treed818305a88168d4aff500e2dc9a5fb590763375a /libbb
parent695fa51c80047eb25cc82e6e1630b4545a6bc0b6 (diff)
downloadbusybox-5e3b14069e3fe25ec2595124e6e0103c7be4f813.zip
busybox-5e3b14069e3fe25ec2595124e6e0103c7be4f813.tar.gz
hwclock: make it report system/rtc clock difference
function old new delta rtc_tm2time - 89 +89 read_rtc 23 86 +63 rtc_read_tm - 49 +49 hwclock_main 428 466 +38 rtcwake_main 453 477 +24 rtc_read_time 142 - -142 ------------------------------------------------------------------------------ (add/remove: 2/1 grow/shrink: 3/0 up/down: 263/-142) Total: 121 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
-rw-r--r--libbb/rtc.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/libbb/rtc.c b/libbb/rtc.c
index 2f38b8a..9807e1c 100644
--- a/libbb/rtc.c
+++ b/libbb/rtc.c
@@ -59,15 +59,17 @@ int FAST_FUNC rtc_xopen(const char **default_rtc, int flags)
return xopen(*default_rtc, flags);
}
-time_t FAST_FUNC rtc_read_time(int fd, int utc)
+void FAST_FUNC rtc_read_tm(struct tm *tm, int fd)
{
- struct tm tm;
- char *oldtz = 0;
- time_t t = 0;
+ memset(tm, 0, sizeof(*tm));
+ xioctl(fd, RTC_RD_TIME, tm);
+ tm->tm_isdst = -1; /* "not known" */
+}
- memset(&tm, 0, sizeof(struct tm));
- xioctl(fd, RTC_RD_TIME, &tm);
- tm.tm_isdst = -1; /* not known */
+time_t FAST_FUNC rtc_tm2time(struct tm *tm, int utc)
+{
+ char *oldtz = oldtz; /* for compiler */
+ time_t t;
if (utc) {
oldtz = getenv("TZ");
@@ -75,7 +77,7 @@ time_t FAST_FUNC rtc_read_time(int fd, int utc)
tzset();
}
- t = mktime(&tm);
+ t = mktime(tm);
if (utc) {
unsetenv("TZ");