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
/
resolve
/
resolved-manager.c
diff --git
a/src/resolve/resolved-manager.c
b/src/resolve/resolved-manager.c
index 9f61c9d9a294a3e03a03eb3d1153d527f7be5de8..0594479787606127426a59e9b2a477f4352735e7 100644
(file)
--- a/
src/resolve/resolved-manager.c
+++ b/
src/resolve/resolved-manager.c
@@
-370,7
+370,7
@@
static int manager_watch_hostname(Manager *m) {
m->hostname_fd = open("/proc/sys/kernel/hostname", O_RDONLY|O_CLOEXEC|O_NDELAY|O_NOCTTY);
if (m->hostname_fd < 0) {
m->hostname_fd = open("/proc/sys/kernel/hostname", O_RDONLY|O_CLOEXEC|O_NDELAY|O_NOCTTY);
if (m->hostname_fd < 0) {
- log_warning
(
"Failed to watch hostname: %m");
+ log_warning
_errno(errno,
"Failed to watch hostname: %m");
return 0;
}
return 0;
}
@@
-379,10
+379,8
@@
static int manager_watch_hostname(Manager *m) {
if (r == -EPERM)
/* kernels prior to 3.2 don't support polling this file. Ignore the failure. */
m->hostname_fd = safe_close(m->hostname_fd);
if (r == -EPERM)
/* kernels prior to 3.2 don't support polling this file. Ignore the failure. */
m->hostname_fd = safe_close(m->hostname_fd);
- else {
- log_error_errno(r, "Failed to add hostname event source: %m");
- return r;
- }
+ else
+ return log_error_errno(r, "Failed to add hostname event source: %m");
}
r = determine_hostname(&m->hostname);
}
r = determine_hostname(&m->hostname);
@@
-593,7
+591,7
@@
int manager_read_resolv_conf(Manager *m) {
r = stat("/etc/resolv.conf", &st);
if (r < 0) {
if (errno != ENOENT)
r = stat("/etc/resolv.conf", &st);
if (r < 0) {
if (errno != ENOENT)
- log_warning
(
"Failed to open /etc/resolv.conf: %m");
+ log_warning
_errno(errno,
"Failed to open /etc/resolv.conf: %m");
r = -errno;
goto clear;
}
r = -errno;
goto clear;
}
@@
-616,13
+614,13
@@
int manager_read_resolv_conf(Manager *m) {
f = fopen("/etc/resolv.conf", "re");
if (!f) {
if (errno != ENOENT)
f = fopen("/etc/resolv.conf", "re");
if (!f) {
if (errno != ENOENT)
- log_warning
(
"Failed to open /etc/resolv.conf: %m");
+ log_warning
_errno(errno,
"Failed to open /etc/resolv.conf: %m");
r = -errno;
goto clear;
}
if (fstat(fileno(f), &st) < 0) {
r = -errno;
goto clear;
}
if (fstat(fileno(f), &st) < 0) {
- log_error
(
"Failed to stat open file: %m");
+ log_error
_errno(errno,
"Failed to stat open file: %m");
r = -errno;
goto clear;
}
r = -errno;
goto clear;
}