]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
Revert prior and just use __func__. Do same for arp bpf.
authorRoy Marples <roy@marples.name>
Mon, 3 Apr 2017 12:18:36 +0000 (13:18 +0100)
committerRoy Marples <roy@marples.name>
Mon, 3 Apr 2017 12:18:36 +0000 (13:18 +0100)
src/arp.c
src/dhcp.c

index fc1223e1a547a36a041ff82b1a1832349c6e34e8..b89a12ecc285947f1f1463dcdb2662fe635d8c9a 100644 (file)
--- a/src/arp.c
+++ b/src/arp.c
@@ -202,7 +202,7 @@ arp_read(void *arg)
        while (!(flags & BPF_EOF)) {
                bytes = bpf_read(ifp, state->fd, buf, sizeof(buf), &flags);
                if (bytes == -1) {
-                       syslog(LOG_ERR, "%s: arp bpf_read: %m", ifp->name);
+                       syslog(LOG_ERR, "%s: %s: %m", __func__, ifp->name);
                        arp_close(ifp);
                        return;
                }
index 0dfee1ef2fd770caa018dba96838043767aba250..caf477614c569bd4e454cd790c100916c3551bd7 100644 (file)
@@ -3261,10 +3261,9 @@ dhcp_readpacket(void *arg)
         * so we have to process the entire buffer. */
        flags = 0;
        while (!(flags & BPF_EOF)) {
-               bytes = bpf_read(ifp, state->bpf_fd, buf,sizeof(buf), &flags);
+               bytes = bpf_read(ifp, state->bpf_fd, buf, sizeof(buf), &flags);
                if (bytes == -1) {
-                       syslog(LOG_ERR, "%s: dhcp bpf_read: %m",
-                           ifp->name);
+                       syslog(LOG_ERR, "%s: %s: %m", __func__, ifp->name);
                        dhcp_close(ifp);
                        return;
                }