chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
resolve: remove unused variable
[elogind.git]
/
src
/
resolve
/
resolved-manager.c
diff --git
a/src/resolve/resolved-manager.c
b/src/resolve/resolved-manager.c
index c4a5b08773995b26b7c123f66f40fc703b52f6e5..0594479787606127426a59e9b2a477f4352735e7 100644
(file)
--- a/
src/resolve/resolved-manager.c
+++ b/
src/resolve/resolved-manager.c
@@
-100,7
+100,7
@@
static int manager_process_link(sd_rtnl *rtnl, sd_rtnl_message *mm, void *userda
return 0;
fail:
return 0;
fail:
- log_warning
("Failed to process RTNL link message: %s", strerror(-r)
);
+ log_warning
_errno(r, "Failed to process RTNL link message: %m"
);
return 0;
}
return 0;
}
@@
-185,7
+185,7
@@
static int manager_process_address(sd_rtnl *rtnl, sd_rtnl_message *mm, void *use
return 0;
fail:
return 0;
fail:
- log_warning
("Failed to process RTNL address message: %s", strerror(-r)
);
+ log_warning
_errno(r, "Failed to process RTNL address message: %m"
);
return 0;
}
return 0;
}
@@
-278,12
+278,12
@@
static int on_network_event(sd_event_source *s, int fd, uint32_t revents, void *
HASHMAP_FOREACH(l, m->links, i) {
r = link_update_monitor(l);
if (r < 0)
HASHMAP_FOREACH(l, m->links, i) {
r = link_update_monitor(l);
if (r < 0)
- log_warning
("Failed to update monitor information for %i: %s", l->ifindex, strerror(-r)
);
+ log_warning
_errno(r, "Failed to update monitor information for %i: %m", l->ifindex
);
}
r = manager_write_resolv_conf(m);
if (r < 0)
}
r = manager_write_resolv_conf(m);
if (r < 0)
- log_warning
("Could not update resolv.conf: %s", strerror(-r)
);
+ log_warning
_errno(r, "Could not update resolv.conf: %m"
);
return 0;
}
return 0;
}
@@
-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("Failed to add hostname event source: %s", strerror(-r));
- 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;
}
@@
-688,7
+686,7
@@
static void write_resolv_conf_server(DnsServer *s, FILE *f, unsigned *count) {
r = in_addr_to_string(s->family, &s->address, &t);
if (r < 0) {
r = in_addr_to_string(s->family, &s->address, &t);
if (r < 0) {
- log_warning
("Invalid DNS address. Ignoring: %s", strerror(-r)
);
+ log_warning
_errno(r, "Invalid DNS address. Ignoring: %m"
);
return;
}
return;
}