From: Roy Marples <roy@marples.name>
Date: Thu, 6 Apr 2017 12:16:15 +0000 (+0100)
Subject: Move ROUTER_FILTER assignments to variable declaration.
X-Git-Tag: v7.0.0-beta3~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0a116d01ea5502959ae2b5d713c24b15aa7fcd1;p=thirdparty%2Fdhcpcd.git

Move ROUTER_FILTER assignments to variable declaration.
---

diff --git a/src/if-bsd.c b/src/if-bsd.c
index eeb5a4b4..f58dd2cb 100644
--- a/src/if-bsd.c
+++ b/src/if-bsd.c
@@ -121,7 +121,18 @@ if_opensockets_os(struct dhcpcd_ctx *ctx)
 {
 	struct priv *priv;
 #ifdef ROUTE_MSGFILTER
-	unsigned int msgfilter;
+	unsigned int msgfilter = ROUTE_FILTER(RTM_IFINFO)
+#ifdef RTM_IFANNOUNCE
+	    | ROUTE_FILTER(RTM_IFANNOUNCE)
+#endif
+	    | ROUTE_FILTER(RTM_ADD)
+	    | ROUTE_FILTER(RTM_CHANGE)
+	    | ROUTE_FILTER(RTM_DELETE)
+#ifdef RTM_CHGADDR
+	    | ROUTE_FILTER(RTM_CHGADDR)
+#endif
+	    | ROUTE_FILTER(RTM_DELADDR)
+	    | ROUTE_FILTER(RTM_NEWADDR);
 #endif
 
 	if ((priv = malloc(sizeof(*priv))) == NULL)
@@ -142,18 +153,6 @@ if_opensockets_os(struct dhcpcd_ctx *ctx)
 #undef SOCK_FLAGS
 
 #ifdef ROUTE_MSGFILTER
-	msgfilter = ROUTE_FILTER(RTM_IFINFO)
-#ifdef RTM_IFANNOUNCE
-	    | ROUTE_FILTER(RTM_IFANNOUNCE)
-#endif
-	    | ROUTE_FILTER(RTM_ADD)
-	    | ROUTE_FILTER(RTM_CHANGE)
-	    | ROUTE_FILTER(RTM_DELETE)
-#ifdef RTM_CHGADDR
-	    | ROUTE_FILTER(RTM_CHGADDR)
-#endif
-	    | ROUTE_FILTER(RTM_DELADDR)
-	    | ROUTE_FILTER(RTM_NEWADDR);
 	if (setsockopt(ctx->link_fd, PF_ROUTE, ROUTE_MSGFILTER,
 	    &msgfilter, sizeof(msgfilter)) == -1)
 		syslog(LOG_ERR, "ROUTE_MSGFILTER: %m");