picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tree-wide: use returned value from log_*_errno()

This commit is contained in:
Yu Watanabe 2018-08-07 15:48:37 +09:00
parent 4ae25393f3
commit fc95c359f6
6 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/mount.c
View File

@ -1584,8 +1584,7 @@ static int mount_setup_unit(
return 0;
fail:
log_warning_errno(r, "Failed to set up mount unit: %m");
return r;
return log_warning_errno(r, "Failed to set up mount unit: %m");
}
static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) {

6
src/libsystemd/sd-device/sd-device.c
View File

@ -515,10 +515,8 @@ int device_read_uevent_file(sd_device *device) {
else if (r == -ENOENT)
/* some devices may not have uevent files, see set_syspath() */
return 0;
else if (r < 0) {
log_debug_errno(r, "sd-device: failed to read uevent file '%s': %m", path);
return r;
}
else if (r < 0)
return log_debug_errno(r, "sd-device: failed to read uevent file '%s': %m", path);
for (i = 0; i < uevent_len; i++)
switch (state) {

6
src/network/networkd-dhcp4.c
View File

@ -503,10 +503,8 @@ static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) {
if (!link->network->dhcp_critical) {
r = sd_dhcp_lease_get_lifetime(link->dhcp_lease, &lifetime);
if (r < 0) {
log_link_warning_errno(link, r, "DHCP error: no lifetime: %m");
return r;
}
if (r < 0)
return log_link_warning_errno(link, r, "DHCP error: no lifetime: %m");
}
r = dhcp4_update_address(link, &address, &netmask, lifetime);

12
src/network/networkd-ipv4ll.c
View File

@ -26,10 +26,8 @@ static int ipv4ll_address_lost(Link *link) {
log_link_debug(link, "IPv4 link-local release %u.%u.%u.%u", ADDRESS_FMT_VAL(addr));
r = address_new(&address);
if (r < 0) {
log_link_error_errno(link, r, "Could not allocate address: %m");
return r;
}
if (r < 0)
return log_link_error_errno(link, r, "Could not allocate address: %m");
address->family = AF_INET;
address->in_addr.in = addr;
@ -39,10 +37,8 @@ static int ipv4ll_address_lost(Link *link) {
address_remove(address, link, link_address_remove_handler);
r = route_new(&route);
if (r < 0) {
log_link_error_errno(link, r, "Could not allocate route: %m");
return r;
}
if (r < 0)
return log_link_error_errno(link, r, "Could not allocate route: %m");
route->family = AF_INET;
route->scope = RT_SCOPE_LINK;

12
src/network/networkd-link.c
View File

@ -1175,10 +1175,8 @@ static int link_enter_set_addresses(Link *link) {
}
r = sd_dhcp_server_set_emit_router(link->dhcp_server, link->network->dhcp_server_emit_router);
if (r < 0) {
log_link_warning_errno(link, r, "Failed to set router emission for DHCP server: %m");
return r;
}
if (r < 0)
return log_link_warning_errno(link, r, "Failed to set router emission for DHCP server: %m");
if (link->network->dhcp_server_emit_timezone) {
_cleanup_free_ char *buffer = NULL;
@ -3386,10 +3384,8 @@ int link_update(Link *link, sd_netlink_message *m) {
if (link->dhcp_client) {
r = sd_dhcp_client_set_mtu(link->dhcp_client,
link->mtu);
if (r < 0) {
log_link_warning_errno(link, r, "Could not update MTU in DHCP client: %m");
return r;
}
if (r < 0)
return log_link_warning_errno(link, r, "Could not update MTU in DHCP client: %m");
}
if (link->radv) {

6
src/shared/dissect-image.c
View File

@ -1101,10 +1101,8 @@ int dissected_image_decrypt_interactively(
return r;
if (r == -EKEYREJECTED)
log_error_errno(r, "Incorrect passphrase, try again!");
else if (r != -ENOKEY) {
log_error_errno(r, "Failed to decrypt image: %m");
return r;
}
else if (r != -ENOKEY)
return log_error_errno(r, "Failed to decrypt image: %m");
if (--n < 0) {
log_error("Too many retries.");