Index: usr.sbin/ndp/ndp.c
===================================================================
--- usr.sbin/ndp/ndp.c
+++ usr.sbin/ndp/ndp.c
@@ -109,10 +109,11 @@
 #include <unistd.h>
 #include "gmt2local.h"
 
-#define NEXTADDR(w, s) \
-	if (rtm->rtm_addrs & (w)) { \
-		bcopy((char *)&s, cp, sizeof(s)); cp += SA_SIZE(&s);}
-
+#define	NEXTADDR(w, s)					\
+	if (rtm->rtm_addrs & (w)) {			\
+		bcopy((char *)&s, cp, sizeof(s));	\
+		cp += SA_SIZE(&s);			\
+	}
 
 static pid_t pid;
 static int nflag;
@@ -144,7 +145,7 @@
 #ifdef SIOCSDEFIFACE_IN6	/* XXX: check SIOCGDEFIFACE_IN6 as well? */
 static void getdefif(void);
 static void setdefif(char *);
-#endif
+#endif /* SIOCSDEFIFACE_IN6 */
 static char *sec2str(time_t);
 static void ts_print(const struct timeval *);
 
@@ -247,10 +248,10 @@
 		}
 		getdefif(); /* always call it to print the result */
 		break;
-#else
+#else /* !SIOCSDEFIFACE_IN6 */
 		errx(1, "not supported yet");
 		/*NOTREACHED*/
-#endif
+#endif /* SIOCSDEFIFACE_IN6 */
 	case 'p':
 		if (argc != 0) {
 			usage();
@@ -529,10 +530,10 @@
 		printf("cannot locate %s\n", host);
 		return (1);
 	}
-        /* 
-         * need to reinit the field because it has rt_key
-         * but we want the actual address
-         */
+	/*
+	 * need to reinit the field because it has rt_key
+	 * but we want the actual address
+	 */
 	NEXTADDR(RTA_DST, sin_m);
 	rtm->rtm_flags |= RTF_LLDATA;
 	if (rtmsg(RTM_DELETE) == 0) {
@@ -585,9 +586,9 @@
 	mib[4] = NET_RT_FLAGS;
 #ifdef RTF_LLINFO
 	mib[5] = RTF_LLINFO;
-#else
+#else /* !RTF_LLINFO */
 	mib[5] = 0;
-#endif
+#endif /* RTF_LLINFO */
 	if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
 		err(1, "sysctl(PF_ROUTE estimate)");
 	if (needed > 0) {
@@ -604,7 +605,8 @@
 
 		rtm = (struct rt_msghdr *)next;
 		sin = (struct sockaddr_in6 *)(rtm + 1);
-		sdl = (struct sockaddr_dl *)((char *)sin + ALIGN(sin->sin6_len));
+		sdl = (struct sockaddr_dl *)((char *)sin +
+		    ALIGN(sin->sin6_len));
 
 		/*
 		 * Some OSes can produce a route that has the LINK flag but
@@ -648,11 +650,11 @@
 #elif defined(RTF_CLONED)
 			if (rtm->rtm_flags & RTF_CLONED)
 				delete(host_buf);
-#else
+#else /* !RTF_WASCLONED && !RTF_CLONED */
 			if (rtm->rtm_flags & RTF_PINNED)
 				continue;
 			delete(host_buf);
-#endif
+#endif /* RTF_WASCLONED */
 			continue;
 		}
 		gettimeofday(&now, 0);
@@ -692,7 +694,7 @@
 		case ND6_LLINFO_WAITDELETE:
 			printf(" W");
 			break;
-#endif
+#endif /* ND6_LLINFO_WAITDELETE */
 		case ND6_LLINFO_INCOMPLETE:
 			printf(" I");
 			break;
@@ -724,7 +726,7 @@
 			    isrouter ? "R" : "",
 			    (rtm->rtm_flags & RTF_ANNOUNCE) ? "p" : "");
 		} else {
-#if 0	/* W and P are mystery even for us */
+#if 0			/* W and P are mystery even for us */
 			sin = (struct sockaddr_in6 *)
 			    (sdl->sdl_len + (char *)sdl);
 			snprintf(flgbuf, sizeof(flgbuf), "%s%s%s%s",
@@ -823,7 +825,7 @@
 	printf("       ndp [-nt] -i interface [flags...]\n");
 #ifdef SIOCSDEFIFACE_IN6
 	printf("       ndp [-nt] -I [interface|delete]\n");
-#endif
+#endif /* SIOCSDEFIFACE_IN6 */
 	printf("       ndp [-nt] -s nodename etheraddr [temp] [proxy]\n");
 	exit(1);
 }
@@ -855,7 +857,7 @@
 			rtm->rtm_inits = RTV_EXPIRE;
 		}
 		rtm->rtm_flags |= (RTF_HOST | RTF_STATIC | RTF_LLDATA);
-#if 0 /* we don't support ipv6addr/128 type proxying */
+#if 0		/* we don't support ipv6addr/128 type proxying */
 		if (rtm->rtm_flags & RTF_ANNOUNCE) {
 			rtm->rtm_flags &= ~RTF_HOST;
 			rtm->rtm_addrs |= RTA_NETMASK;
@@ -868,7 +870,7 @@
 
 	NEXTADDR(RTA_DST, sin_m);
 	NEXTADDR(RTA_GATEWAY, sdl_m);
-#if 0 /* we don't support ipv6addr/128 type proxying */
+#if 0	/* we don't support ipv6addr/128 type proxying */
 	memset(&so_mask.sin6_addr, 0xff, sizeof(so_mask.sin6_addr));
 	NEXTADDR(RTA_NETMASK, so_mask);
 #endif
@@ -901,7 +903,7 @@
 	u_int32_t newflags;
 #ifdef IPV6CTL_USETEMPADDR
 	u_int8_t nullbuf[8];
-#endif
+#endif /* IPV6CTL_USETEMPADDR */
 
 	if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
 		err(1, "socket");
@@ -913,7 +915,7 @@
 		err(1, "ioctl(SIOCGIFINFO_IN6)");
 		/* NOTREACHED */
 	}
-#define ND nd.ndi
+#define	ND nd.ndi
 	newflags = ND.flags;
 	for (i = 0; i < argc; i++) {
 		int clear = 0;
@@ -924,47 +926,45 @@
 			cp++;
 		}
 
-#define SETFLAG(s, f) \
-	do {\
-		if (strcmp(cp, (s)) == 0) {\
-			if (clear)\
-				newflags &= ~(f);\
-			else\
-				newflags |= (f);\
-		}\
-	} while (0)
+#define	SETFLAG(s, f) do {			\
+	if (strcmp(cp, (s)) == 0) {		\
+		if (clear)			\
+			newflags &= ~(f);	\
+		else				\
+			newflags |= (f);	\
+	}					\
+} while (0)
 /*
  * XXX: this macro is not 100% correct, in that it matches "nud" against
  *      "nudbogus".  But we just let it go since this is minor.
  */
-#define SETVALUE(f, v) \
-	do { \
-		char *valptr; \
-		unsigned long newval; \
-		v = 0; /* unspecified */ \
-		if (strncmp(cp, f, strlen(f)) == 0) { \
-			valptr = strchr(cp, '='); \
-			if (valptr == NULL) \
-				err(1, "syntax error in %s field", (f)); \
-			errno = 0; \
-			newval = strtoul(++valptr, NULL, 0); \
-			if (errno) \
-				err(1, "syntax error in %s's value", (f)); \
-			v = newval; \
-		} \
-	} while (0)
+#define	SETVALUE(f, v) do {						\
+	char *valptr;							\
+	unsigned long newval;						\
+	v = 0; /* unspecified */					\
+	if (strncmp(cp, f, strlen(f)) == 0) {				\
+		valptr = strchr(cp, '=');				\
+		if (valptr == NULL)					\
+			err(1, "syntax error in %s field", (f));	\
+		errno = 0;						\
+		newval = strtoul(++valptr, NULL, 0);			\
+		if (errno)						\
+			err(1, "syntax error in %s's value", (f));	\
+		v = newval;						\
+	}								\
+} while (0)
 
 		SETFLAG("disabled", ND6_IFF_IFDISABLED);
 		SETFLAG("nud", ND6_IFF_PERFORMNUD);
 #ifdef ND6_IFF_ACCEPT_RTADV
 		SETFLAG("accept_rtadv", ND6_IFF_ACCEPT_RTADV);
-#endif
+#endif /* ND6_IFF_ACCEPT_RTADV */
 #ifdef ND6_IFF_AUTO_LINKLOCAL
 		SETFLAG("auto_linklocal", ND6_IFF_AUTO_LINKLOCAL);
-#endif
+#endif /* ND6_IFF_AUTO_LINKLOCAL */
 #ifdef ND6_IFF_NO_PREFER_IFACE
 		SETFLAG("no_prefer_iface", ND6_IFF_NO_PREFER_IFACE);
-#endif
+#endif /* ND6_IFF_NO_PREFER_IFACE */
 		SETVALUE("basereachable", ND.basereachable);
 		SETVALUE("retrans", ND.retrans);
 		SETVALUE("curhlim", ND.chlim);
@@ -1021,19 +1021,19 @@
 				printf("%02x", rbuf[j]);
 		}
 	}
-#endif
+#endif /* IPV6CTL_USETEMPADDR */
 	if (ND.flags) {
 		printf("\nFlags: ");
 #ifdef ND6_IFF_IFDISABLED
 		if ((ND.flags & ND6_IFF_IFDISABLED))
 			printf("disabled ");
-#endif
+#endif /* ND6_IFF_IFDISABLED */
 		if ((ND.flags & ND6_IFF_PERFORMNUD))
 			printf("nud ");
 #ifdef ND6_IFF_ACCEPT_RTADV
 		if ((ND.flags & ND6_IFF_ACCEPT_RTADV))
 			printf("accept_rtadv ");
-#endif
+#endif /* ND6_IFF_ACCEPT_RTADV */
 #ifdef ND6_IFF_AUTO_LINKLOCAL
 		if ((ND.flags & ND6_IFF_AUTO_LINKLOCAL))
 			printf("auto_linklocal ");
@@ -1041,7 +1041,7 @@
 #ifdef ND6_IFF_NO_PREFER_IFACE
 		if ((ND.flags & ND6_IFF_NO_PREFER_IFACE))
 			printf("no_prefer_iface ");
-#endif
+#endif /* ND6_IFF_NO_PREFER_IFACE */
 	}
 	putc('\n', stdout);
 #undef ND
@@ -1156,9 +1156,9 @@
 		    (p->flags & NDPRF_DETACHED) != 0 ? "D" : "",
 #ifdef NDPRF_HOME
 		    (p->flags & NDPRF_HOME) != 0 ? "H" : ""
-#else
+#else /* !NDPRF_HOME */
 		    ""
-#endif
+#endif /* NDPRF_HOME */
 		    );
 		if (p->vltime == ND6_INFINITE_LIFETIME)
 			printf(" vltime=infinity");
@@ -1314,7 +1314,7 @@
 
 	close(s);
 }
-#endif
+#endif /* SIOCSDEFIFACE_IN6 */
 
 static char *
 sec2str(time_t total)