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: more log_*_errno + return simplifications
[elogind.git]
/
src
/
libsystemd-network
/
sd-dhcp-lease.c
diff --git
a/src/libsystemd-network/sd-dhcp-lease.c
b/src/libsystemd-network/sd-dhcp-lease.c
index f046ac5672fbb4fd85ef798675e5920523b6dfc2..22a4af6837db96c02e34f0839eb711b60d90cf3e 100644
(file)
--- a/
src/libsystemd-network/sd-dhcp-lease.c
+++ b/
src/libsystemd-network/sd-dhcp-lease.c
@@
-51,7
+51,7
@@
int sd_dhcp_lease_get_address(sd_dhcp_lease *lease, struct in_addr *addr) {
int sd_dhcp_lease_get_lifetime(sd_dhcp_lease *lease, uint32_t *lifetime) {
assert_return(lease, -EINVAL);
int sd_dhcp_lease_get_lifetime(sd_dhcp_lease *lease, uint32_t *lifetime) {
assert_return(lease, -EINVAL);
- assert_return(l
eas
e, -EINVAL);
+ assert_return(l
ifetim
e, -EINVAL);
*lifetime = lease->lifetime;
*lifetime = lease->lifetime;
@@
-685,7
+685,7
@@
int sd_dhcp_lease_save(sd_dhcp_lease *lease, const char *lease_file) {
finish:
if (r < 0)
finish:
if (r < 0)
- log_error
("Failed to save lease data %s: %s", lease_file, strerror(-r)
);
+ log_error
_errno(r, "Failed to save lease data %s: %m", lease_file
);
return r;
}
return r;
}
@@
-725,8
+725,7
@@
int sd_dhcp_lease_load(sd_dhcp_lease **ret, const char *lease_file) {
if (r == -ENOENT)
return 0;
if (r == -ENOENT)
return 0;
- log_error("Failed to read %s: %s", lease_file, strerror(-r));
- return r;
+ return log_error_errno(r, "Failed to read %s: %m", lease_file);
}
r = inet_pton(AF_INET, address, &addr);
}
r = inet_pton(AF_INET, address, &addr);