From: Roy Marples <roy@marples.name>
Date: Mon, 3 Apr 2017 12:18:36 +0000 (+0100)
Subject: Revert prior and just use __func__. Do same for arp bpf.
X-Git-Tag: v7.0.0-beta3~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f01433b3388d7caa972aca27a0695b9396df3a8b;p=thirdparty%2Fdhcpcd.git

Revert prior and just use __func__. Do same for arp bpf.
---

diff --git a/src/arp.c b/src/arp.c
index fc1223e1..b89a12ec 100644
--- 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;
 		}
diff --git a/src/dhcp.c b/src/dhcp.c
index 0dfee1ef..caf47761 100644
--- a/src/dhcp.c
+++ b/src/dhcp.c
@@ -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;
 		}