[systemd-commits] src/shared src/timedate
Kay Sievers
kay at kemper.freedesktop.org
Fri May 23 19:28:10 PDT 2014
src/shared/clock-util.c | 4 ++--
src/shared/clock-util.h | 4 ++--
src/timedate/timedated.c | 11 +++++------
3 files changed, 9 insertions(+), 10 deletions(-)
New commits:
commit 609896125cb89cac2fcd5b80b532de97d7a64c0a
Author: Kay Sievers <kay at vrfy.org>
Date: Sat May 24 10:26:33 2014 +0800
clock-util: clock_[sg]et_time() -> clock_[sg]et_hwclock()
diff --git a/src/shared/clock-util.c b/src/shared/clock-util.c
index 4f31c10..e66db63 100644
--- a/src/shared/clock-util.c
+++ b/src/shared/clock-util.c
@@ -43,7 +43,7 @@
#include "clock-util.h"
#include "fileio.h"
-int clock_get_time(struct tm *tm) {
+int clock_get_hwclock(struct tm *tm) {
_cleanup_close_ int fd = -1;
assert(tm);
@@ -64,7 +64,7 @@ int clock_get_time(struct tm *tm) {
return 0;
}
-int clock_set_time(const struct tm *tm) {
+int clock_set_hwclock(const struct tm *tm) {
_cleanup_close_ int fd = -1;
assert(tm);
diff --git a/src/shared/clock-util.h b/src/shared/clock-util.h
index 63d96fc..4deeac7 100644
--- a/src/shared/clock-util.h
+++ b/src/shared/clock-util.h
@@ -24,5 +24,5 @@
int clock_is_localtime(void);
int clock_set_timezone(int *min);
int clock_reset_timezone(void);
-int clock_get_time(struct tm *tm);
-int clock_set_time(const struct tm *tm);
+int clock_get_hwclock(struct tm *tm);
+int clock_set_hwclock(const struct tm *tm);
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index 95255de..0e74c25 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -465,7 +465,7 @@ static int property_get_rtc_time(
int r;
zero(tm);
- r = clock_get_time(&tm);
+ r = clock_get_hwclock(&tm);
if (r == -EBUSY) {
log_warning("/dev/rtc is busy. Is somebody keeping it open continuously? That's not a good idea... Returning a bogus RTC timestamp.");
t = 0;
@@ -555,7 +555,7 @@ static int method_set_timezone(sd_bus *bus, sd_bus_message *m, void *userdata, s
/* 3. Sync RTC from system clock, with the new delta */
assert_se(clock_gettime(CLOCK_REALTIME, &ts) == 0);
assert_se(tm = localtime(&ts.tv_sec));
- clock_set_time(tm);
+ clock_set_hwclock(tm);
}
log_struct(LOG_INFO,
@@ -621,7 +621,7 @@ static int method_set_local_rtc(sd_bus *bus, sd_bus_message *m, void *userdata,
/* Override the main fields of
* struct tm, but not the timezone
* fields */
- if (clock_get_time(&tm) >= 0) {
+ if (clock_get_hwclock(&tm) >= 0) {
/* And set the system clock
* with this */
@@ -642,7 +642,7 @@ static int method_set_local_rtc(sd_bus *bus, sd_bus_message *m, void *userdata,
else
tm = gmtime(&ts.tv_sec);
- clock_set_time(tm);
+ clock_set_hwclock(tm);
}
log_info("RTC configured to %s time.", c->local_rtc ? "local" : "UTC");
@@ -705,8 +705,7 @@ static int method_set_time(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bu
tm = localtime(&ts.tv_sec);
else
tm = gmtime(&ts.tv_sec);
-
- clock_set_time(tm);
+ clock_set_hwclock(tm);
log_struct(LOG_INFO,
MESSAGE_ID(SD_MESSAGE_TIME_CHANGE),
More information about the systemd-commits
mailing list