chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-dhcp-client: use RFC4361-complient ClientID by default
[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 9e24b6ab717f044d433cb187dc72f6b11cfe85dc..00fef164b0e40ce662cd2da66d74089171af3ee6 100644
(file)
--- a/
src/libsystemd-network/sd-dhcp-lease.c
+++ b/
src/libsystemd-network/sd-dhcp-lease.c
@@
-193,7
+193,7
@@
sd_dhcp_lease *sd_dhcp_lease_ref(sd_dhcp_lease *lease) {
}
sd_dhcp_lease *sd_dhcp_lease_unref(sd_dhcp_lease *lease) {
}
sd_dhcp_lease *sd_dhcp_lease_unref(sd_dhcp_lease *lease) {
- if (lease && REFCNT_DEC(lease->n_ref)
<
= 0) {
+ if (lease && REFCNT_DEC(lease->n_ref)
=
= 0) {
free(lease->hostname);
free(lease->domainname);
free(lease->dns);
free(lease->hostname);
free(lease->domainname);
free(lease->dns);
@@
-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_errno(r, "Failed to read %s: %m", lease_file);
- 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);