 @@ -1,16 +1,16 @@
-/*	$NetBSD: ifwatchd.c,v 1.38 2016/10/06 10:33:05 roy Exp $	*/
+/*	$NetBSD: ifwatchd.c,v 1.39 2016/10/06 11:08:55 roy Exp $	*/
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: ifwatchd.c,v 1.38 2016/10/06 10:33:05 roy Exp $");
+__RCSID("$NetBSD: ifwatchd.c,v 1.39 2016/10/06 11:08:55 roy Exp $");
 /*-
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Martin Husemann <martin@NetBSD.org>.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -58,27 +58,26 @@ __RCSID("$NetBSD: ifwatchd.c,v 1.38 2016
 enum event { ARRIVAL, DEPARTURE, UP, DOWN, CARRIER, NO_CARRIER };
 enum addrflag { NOTREADY, DETACHED, READY };
 /* local functions */
 __dead static void usage(void);
 static void dispatch(const void *, size_t);
 static enum addrflag check_addrflags(int af, int addrflags);
 static void check_addrs(const struct ifa_msghdr *ifam);
 static void invoke_script(const char *ifname, enum event ev,
     const struct sockaddr *sa, const struct sockaddr *dst);
 static void list_interfaces(const char *ifnames);
 static void check_announce(const struct if_announcemsghdr *ifan);
 static void check_carrier(const struct if_msghdr *ifm);
 static void rescan_interfaces(void);
 static void free_interfaces(void);
 static struct interface_data * find_interface(int index);
 static void run_initial_ups(void);
 /* global variables */
 static int verbose = 0, quiet = 0;
 static int inhibit_initial = 0;
 static const char *arrival_script = NULL;
 static const char *departure_script = NULL;
 static const char *up_script = NULL;
 static const char *down_script = NULL;
 static const char *carrier_script = NULL;
 static const char *no_carrier_script = NULL;
 @@ -247,27 +246,26 @@ static void
 dispatch(const void *msg, size_t len)
+{
 	const struct rt_msghdr *hd = msg;
 	if (hd->rtm_version != RTM_VERSION)
 		return;
 	switch (hd->rtm_type) {
 	case RTM_NEWADDR:
 	case RTM_DELADDR:
 		check_addrs(msg);
 		break;
 	case RTM_IFANNOUNCE:
 		rescan_interfaces();
 		check_announce(msg);
 		break;
 	case RTM_IFINFO:
 		check_carrier(msg);
 		break;
 	case RTM_ADD:
 	case RTM_DELETE:
 	case RTM_CHANGE:
 	case RTM_LOSING:
 	case RTM_REDIRECT:
 	case RTM_MISS:
 	case RTM_IEEE80211:
 	case RTM_ONEWADDR:
 @@ -493,55 +491,45 @@ check_carrier(const struct if_msghdr *if
 static void
 check_announce(const struct if_announcemsghdr *ifan)
+{
 	struct interface_data * p;
 	const char *ifname = ifan->ifan_name;
 	SLIST_FOREACH(p, &ifs, next) {
 		if (strcmp(p->ifname, ifname) != 0)
 			continue;
 		switch (ifan->ifan_what) {
 		case IFAN_ARRIVAL:
 			p->index = ifan->ifan_index;
 			invoke_script(p->ifname, ARRIVAL, NULL, NULL);
 			break;
 		case IFAN_DEPARTURE:
 			p->index = -1;
 			p->last_carrier_status = LINK_STATE_UNKNOWN;
 			invoke_script(p->ifname, DEPARTURE, NULL, NULL);
 			break;
 		default:
 			if (verbose)
 				(void) printf("unknown announce: "
 				    "what=%d\n", ifan->ifan_what);
 			break;
+		}
 		return;
+	}
+}
 static void
 rescan_interfaces(void)
 	struct interface_data * p;
 	SLIST_FOREACH(p, &ifs, next) {
 		p->index = if_nametoindex(p->ifname);
 		if (verbose)
 			printf("interface \"%s\" has index %d\n", p->ifname,
 			    p->index);
 static void
 free_interfaces(void)
+{
 	struct interface_data * p;
 	while (!SLIST_EMPTY(&ifs)) {
 		p = SLIST_FIRST(&ifs);
 		SLIST_REMOVE_HEAD(&ifs, next);
 		free(p->ifname);
 		free(p);
+	}
+}
 static struct interface_data *