diff options
| author | Michal Schmidt <mschmidt@redhat.com> | 2014-11-28 13:19:16 +0100 |
|---|---|---|
| committer | Michal Schmidt <mschmidt@redhat.com> | 2014-11-28 13:29:21 +0100 |
| commit | da927ba997d68401563b927f92e6e40e021a8e5c (patch) | |
| tree | 71764cd998aef07b8943c5206c9307a93ba9c528 /src/libsystemd-network | |
| parent | 0a1beeb64207eaa88ab9236787b1cbc2f704ae14 (diff) | |
treewide: no need to negate errno for log_*_errno()
It corrrectly handles both positive and negative errno values.
Diffstat (limited to 'src/libsystemd-network')
| -rw-r--r-- | src/libsystemd-network/sd-dhcp-lease.c | 4 | ||||
| -rw-r--r-- | src/libsystemd-network/sd-pppoe.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c index e5ffa90d7..9e24b6ab7 100644 --- a/src/libsystemd-network/sd-dhcp-lease.c +++ b/src/libsystemd-network/sd-dhcp-lease.c @@ -685,7 +685,7 @@ int sd_dhcp_lease_save(sd_dhcp_lease *lease, const char *lease_file) { finish: if (r < 0) - log_error_errno(-r, "Failed to save lease data %s: %m", lease_file); + log_error_errno(r, "Failed to save lease data %s: %m", lease_file); return r; } @@ -725,7 +725,7 @@ int sd_dhcp_lease_load(sd_dhcp_lease **ret, const char *lease_file) { if (r == -ENOENT) return 0; - log_error_errno(-r, "Failed to read %s: %m", lease_file); + log_error_errno(r, "Failed to read %s: %m", lease_file); return r; } diff --git a/src/libsystemd-network/sd-pppoe.c b/src/libsystemd-network/sd-pppoe.c index 9fb6f5382..4f49b799e 100644 --- a/src/libsystemd-network/sd-pppoe.c +++ b/src/libsystemd-network/sd-pppoe.c @@ -422,7 +422,7 @@ static int pppoe_timeout(sd_event_source *s, uint64_t usec, void *userdata) { case PPPOE_STATE_INITIALIZING: r = pppoe_send_initiation(ppp); if (r < 0) - log_warning_errno(-r, "PPPoE: sending PADI failed: %m"); + log_warning_errno(r, "PPPoE: sending PADI failed: %m"); break; case PPPOE_STATE_REQUESTING: @@ -431,14 +431,14 @@ static int pppoe_timeout(sd_event_source *s, uint64_t usec, void *userdata) { r = pppoe_send_initiation(ppp); if (r < 0) - log_warning_errno(-r, "PPPoE: sending PADI failed: %m"); + log_warning_errno(r, "PPPoE: sending PADI failed: %m"); ppp->padr_resend_count = PPPOE_MAX_PADR_RESEND; ppp->state = PPPOE_STATE_INITIALIZING; } else { r = pppoe_send_request(ppp); if (r < 0) - log_warning_errno(-r, "PPPoE: sending PADR failed: %m"); + log_warning_errno(r, "PPPoE: sending PADR failed: %m"); } break; @@ -716,7 +716,7 @@ static int pppoe_receive_message(sd_event_source *s, int fd, uint32_t revents, v len = recvfrom(fd, packet, buflen, 0, &link.sa, &addrlen); if (len < 0) { - log_warning_errno(-r, "PPPoE: could not receive message from raw socket: %m"); + log_warning_errno(r, "PPPoE: could not receive message from raw socket: %m"); return 0; } else if ((size_t)len < sizeof(struct pppoe_hdr)) return 0; |