chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: use log_*_errno whenever %m is in the format string
[elogind.git]
/
src
/
timedate
/
timedated.c
diff --git
a/src/timedate/timedated.c
b/src/timedate/timedated.c
index 5391f5b18f33f83198542dd5ce1625faecb81282..24de21008f31f2c8b5fb9786426dd9a5222a9e60 100644
(file)
--- a/
src/timedate/timedated.c
+++ b/
src/timedate/timedated.c
@@
-74,7
+74,7
@@
static int context_read_data(Context *c) {
if (r == -EINVAL)
log_warning("/etc/localtime should be a symbolic link to a time zone data file in /usr/share/zoneinfo/.");
else
if (r == -EINVAL)
log_warning("/etc/localtime should be a symbolic link to a time zone data file in /usr/share/zoneinfo/.");
else
- log_warning_errno(
-
r, "Failed to get target of /etc/localtime: %m");
+ log_warning_errno(r, "Failed to get target of /etc/localtime: %m");
} else {
const char *e;
} else {
const char *e;
@@
-411,7
+411,7
@@
static int method_set_timezone(sd_bus *bus, sd_bus_message *m, void *userdata, s
/* 1. Write new configuration file */
r = context_write_data_timezone(c);
if (r < 0) {
/* 1. Write new configuration file */
r = context_write_data_timezone(c);
if (r < 0) {
- log_error_errno(
-
r, "Failed to set time zone: %m");
+ log_error_errno(r, "Failed to set time zone: %m");
return sd_bus_error_set_errnof(error, r, "Failed to set time zone: %s", strerror(-r));
}
return sd_bus_error_set_errnof(error, r, "Failed to set time zone: %s", strerror(-r));
}
@@
-467,7
+467,7
@@
static int method_set_local_rtc(sd_bus *bus, sd_bus_message *m, void *userdata,
/* 1. Write new configuration file */
r = context_write_data_local_rtc(c);
if (r < 0) {
/* 1. Write new configuration file */
r = context_write_data_local_rtc(c);
if (r < 0) {
- log_error_errno(
-
r, "Failed to set RTC to local/UTC: %m");
+ log_error_errno(r, "Failed to set RTC to local/UTC: %m");
return sd_bus_error_set_errnof(error, r, "Failed to set RTC to local/UTC: %s", strerror(-r));
}
return sd_bus_error_set_errnof(error, r, "Failed to set RTC to local/UTC: %s", strerror(-r));
}
@@
-569,7
+569,7
@@
static int method_set_time(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bu
/* Set system clock */
if (clock_settime(CLOCK_REALTIME, &ts) < 0) {
/* Set system clock */
if (clock_settime(CLOCK_REALTIME, &ts) < 0) {
- log_error
(
"Failed to set local time: %m");
+ log_error
_errno(errno,
"Failed to set local time: %m");
return sd_bus_error_set_errnof(error, errno, "Failed to set local time: %m");
}
return sd_bus_error_set_errnof(error, errno, "Failed to set local time: %m");
}
@@
-649,28
+649,20
@@
static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) {
assert(_bus);
r = sd_bus_default_system(&bus);
assert(_bus);
r = sd_bus_default_system(&bus);
- if (r < 0) {
- log_error_errno(-r, "Failed to get system bus connection: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to get system bus connection: %m");
r = sd_bus_add_object_vtable(bus, NULL, "/org/freedesktop/timedate1", "org.freedesktop.timedate1", timedate_vtable, c);
r = sd_bus_add_object_vtable(bus, NULL, "/org/freedesktop/timedate1", "org.freedesktop.timedate1", timedate_vtable, c);
- if (r < 0) {
- log_error_errno(-r, "Failed to register object: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to register object: %m");
r = sd_bus_request_name(bus, "org.freedesktop.timedate1", 0);
r = sd_bus_request_name(bus, "org.freedesktop.timedate1", 0);
- if (r < 0) {
- log_error_errno(-r, "Failed to register name: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to register name: %m");
r = sd_bus_attach_event(bus, event, 0);
r = sd_bus_attach_event(bus, event, 0);
- if (r < 0) {
- log_error_errno(-r, "Failed to attach bus to event loop: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to attach bus to event loop: %m");
*_bus = bus;
bus = NULL;
*_bus = bus;
bus = NULL;
@@
-698,7
+690,7
@@
int main(int argc, char *argv[]) {
r = sd_event_default(&event);
if (r < 0) {
r = sd_event_default(&event);
if (r < 0) {
- log_error_errno(
-
r, "Failed to allocate event loop: %m");
+ log_error_errno(r, "Failed to allocate event loop: %m");
goto finish;
}
goto finish;
}
@@
-710,19
+702,19
@@
int main(int argc, char *argv[]) {
r = context_read_data(&context);
if (r < 0) {
r = context_read_data(&context);
if (r < 0) {
- log_error_errno(
-
r, "Failed to read time zone data: %m");
+ log_error_errno(r, "Failed to read time zone data: %m");
goto finish;
}
r = context_read_ntp(&context, bus);
if (r < 0) {
goto finish;
}
r = context_read_ntp(&context, bus);
if (r < 0) {
- log_error_errno(
-
r, "Failed to determine whether NTP is enabled: %m");
+ log_error_errno(r, "Failed to determine whether NTP is enabled: %m");
goto finish;
}
r = bus_event_loop_with_idle(event, bus, "org.freedesktop.timedate1", DEFAULT_EXIT_USEC, NULL, NULL);
if (r < 0) {
goto finish;
}
r = bus_event_loop_with_idle(event, bus, "org.freedesktop.timedate1", DEFAULT_EXIT_USEC, NULL, NULL);
if (r < 0) {
- log_error_errno(
-
r, "Failed to run event loop: %m");
+ log_error_errno(r, "Failed to run event loop: %m");
goto finish;
}
goto finish;
}