chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2076cf8
)
timedated: rename a few things for clarification
author
Lennart Poettering
<lennart@poettering.net>
Thu, 16 Jun 2011 20:15:43 +0000
(22:15 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 21 Jun 2011 17:29:45 +0000
(19:29 +0200)
src/timedated.c
patch
|
blob
|
history
diff --git
a/src/timedated.c
b/src/timedated.c
index ad7b881dafbaf4cd2966eafeaa532ad315ca4ba6..daa3d9c821a5dc400339310d2aa29fb96b73da05 100644
(file)
--- a/
src/timedated.c
+++ b/
src/timedated.c
@@
-50,7
+50,7
@@
" </method>\n" \
" <method name=\"SetLocalRTC\">\n" \
" <arg name=\"local_rtc\" type=\"b\" direction=\"in\"/>\n" \
" </method>\n" \
" <method name=\"SetLocalRTC\">\n" \
" <arg name=\"local_rtc\" type=\"b\" direction=\"in\"/>\n" \
- " <arg name=\"
correct
_system\" type=\"b\" direction=\"in\"/>\n" \
+ " <arg name=\"
fix
_system\" type=\"b\" direction=\"in\"/>\n" \
" <arg name=\"user_interaction\" type=\"b\" direction=\"in\"/>\n" \
" </method>\n" \
" </interface>\n" \
" <arg name=\"user_interaction\" type=\"b\" direction=\"in\"/>\n" \
" </method>\n" \
" </interface>\n" \
@@
-347,14
+347,14
@@
static DBusHandlerResult timedate_message_handler(
} else if (dbus_message_is_method_call(message, "org.freedesktop.timedate1", "SetLocalRTC")) {
dbus_bool_t lrtc;
} else if (dbus_message_is_method_call(message, "org.freedesktop.timedate1", "SetLocalRTC")) {
dbus_bool_t lrtc;
- dbus_bool_t
correct
_system;
+ dbus_bool_t
fix
_system;
dbus_bool_t interactive;
if (!dbus_message_get_args(
message,
&error,
DBUS_TYPE_BOOLEAN, &lrtc,
dbus_bool_t interactive;
if (!dbus_message_get_args(
message,
&error,
DBUS_TYPE_BOOLEAN, &lrtc,
- DBUS_TYPE_BOOLEAN, &
correct
_system,
+ DBUS_TYPE_BOOLEAN, &
fix
_system,
DBUS_TYPE_BOOLEAN, &interactive,
DBUS_TYPE_INVALID))
return bus_send_error_reply(connection, message, &error, -EINVAL);
DBUS_TYPE_BOOLEAN, &interactive,
DBUS_TYPE_INVALID))
return bus_send_error_reply(connection, message, &error, -EINVAL);
@@
-384,7
+384,7
@@
static DBusHandlerResult timedate_message_handler(
/* 3. Synchronize clocks */
assert_se(clock_gettime(CLOCK_REALTIME, &ts) == 0);
/* 3. Synchronize clocks */
assert_se(clock_gettime(CLOCK_REALTIME, &ts) == 0);
- if (
correct
_system) {
+ if (
fix
_system) {
struct tm tm;
/* Sync system clock from RTC; first,
struct tm tm;
/* Sync system clock from RTC; first,
@@
-422,7
+422,7
@@
static DBusHandlerResult timedate_message_handler(
hwclock_set_time(tm);
}
hwclock_set_time(tm);
}
- log_
info("Changed local RTC setting to '%s'.", yes_no(local_rtc)
);
+ log_
error("RTC configured to %s time.", local_rtc ? "local" : "UTC"
);
changed = bus_properties_changed_new(
"/org/freedesktop/timedate1",
changed = bus_properties_changed_new(
"/org/freedesktop/timedate1",