Module Name: src Committed By: msaitoh Date: Fri Aug 16 10:33:17 UTC 2019
Modified Files: src/sbin/ifconfig: af_atalk.c af_inet.c af_inet6.c af_inetany.c af_link.c env.c ether.c extern.h ieee80211.c ifconfig.c parse.c parse.h pfsync.c tunnel.c util.c vlan.c Log Message: Whitespace fix. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sbin/ifconfig/af_atalk.c cvs rdiff -u -r1.25 -r1.26 src/sbin/ifconfig/af_inet.c cvs rdiff -u -r1.38 -r1.39 src/sbin/ifconfig/af_inet6.c cvs rdiff -u -r1.17 -r1.18 src/sbin/ifconfig/af_inetany.c \ src/sbin/ifconfig/util.c cvs rdiff -u -r1.7 -r1.8 src/sbin/ifconfig/af_link.c cvs rdiff -u -r1.11 -r1.12 src/sbin/ifconfig/env.c cvs rdiff -u -r1.6 -r1.7 src/sbin/ifconfig/ether.c cvs rdiff -u -r1.15 -r1.16 src/sbin/ifconfig/extern.h cvs rdiff -u -r1.29 -r1.30 src/sbin/ifconfig/ieee80211.c cvs rdiff -u -r1.239 -r1.240 src/sbin/ifconfig/ifconfig.c cvs rdiff -u -r1.18 -r1.19 src/sbin/ifconfig/parse.c cvs rdiff -u -r1.8 -r1.9 src/sbin/ifconfig/parse.h cvs rdiff -u -r1.1 -r1.2 src/sbin/ifconfig/pfsync.c cvs rdiff -u -r1.20 -r1.21 src/sbin/ifconfig/tunnel.c cvs rdiff -u -r1.14 -r1.15 src/sbin/ifconfig/vlan.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sbin/ifconfig/af_atalk.c diff -u src/sbin/ifconfig/af_atalk.c:1.19 src/sbin/ifconfig/af_atalk.c:1.20 --- src/sbin/ifconfig/af_atalk.c:1.19 Sat Oct 19 00:35:30 2013 +++ src/sbin/ifconfig/af_atalk.c Fri Aug 16 10:33:17 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: af_atalk.c,v 1.19 2013/10/19 00:35:30 christos Exp $ */ +/* $NetBSD: af_atalk.c,v 1.20 2019/08/16 10:33:17 msaitoh Exp $ */ /* * Copyright (c) 1983, 1993 @@ -31,14 +31,14 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: af_atalk.c,v 1.19 2013/10/19 00:35:30 christos Exp $"); +__RCSID("$NetBSD: af_atalk.c,v 1.20 2019/08/16 10:33:17 msaitoh Exp $"); #endif /* not lint */ -#include <sys/param.h> -#include <sys/ioctl.h> +#include <sys/param.h> +#include <sys/ioctl.h> #include <sys/socket.h> -#include <net/if.h> +#include <net/if.h> #include <netatalk/at.h> @@ -185,7 +185,7 @@ sat_print1(const char *prefix, const str char buf[40]; (void)getnameinfo(sa, sa->sa_len, buf, sizeof(buf), NULL, 0, 0); - + printf("%s%s", prefix, buf); } Index: src/sbin/ifconfig/af_inet.c diff -u src/sbin/ifconfig/af_inet.c:1.25 src/sbin/ifconfig/af_inet.c:1.26 --- src/sbin/ifconfig/af_inet.c:1.25 Mon Jun 11 17:45:50 2018 +++ src/sbin/ifconfig/af_inet.c Fri Aug 16 10:33:17 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: af_inet.c,v 1.25 2018/06/11 17:45:50 kamil Exp $ */ +/* $NetBSD: af_inet.c,v 1.26 2019/08/16 10:33:17 msaitoh Exp $ */ /* * Copyright (c) 1983, 1993 @@ -31,14 +31,14 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: af_inet.c,v 1.25 2018/06/11 17:45:50 kamil Exp $"); +__RCSID("$NetBSD: af_inet.c,v 1.26 2019/08/16 10:33:17 msaitoh Exp $"); #endif /* not lint */ -#include <sys/param.h> -#include <sys/ioctl.h> +#include <sys/param.h> +#include <sys/ioctl.h> #include <sys/socket.h> -#include <net/if.h> +#include <net/if.h> #include <netinet/in.h> #include <netinet/in_var.h> Index: src/sbin/ifconfig/af_inet6.c diff -u src/sbin/ifconfig/af_inet6.c:1.38 src/sbin/ifconfig/af_inet6.c:1.39 --- src/sbin/ifconfig/af_inet6.c:1.38 Sat Oct 1 15:10:58 2016 +++ src/sbin/ifconfig/af_inet6.c Fri Aug 16 10:33:17 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: af_inet6.c,v 1.38 2016/10/01 15:10:58 roy Exp $ */ +/* $NetBSD: af_inet6.c,v 1.39 2019/08/16 10:33:17 msaitoh Exp $ */ /* * Copyright (c) 1983, 1993 @@ -31,14 +31,14 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: af_inet6.c,v 1.38 2016/10/01 15:10:58 roy Exp $"); +__RCSID("$NetBSD: af_inet6.c,v 1.39 2019/08/16 10:33:17 msaitoh Exp $"); #endif /* not lint */ -#include <sys/param.h> -#include <sys/ioctl.h> +#include <sys/param.h> +#include <sys/ioctl.h> #include <sys/socket.h> -#include <net/if.h> +#include <net/if.h> #include <netinet/in.h> #include <netinet/in_var.h> #include <netinet6/nd6.h> @@ -222,7 +222,7 @@ setia6eui64_impl(prop_dictionary_t env, errx(EXIT_FAILURE, "eui64 address modifier not allowed for the AF"); } - in6 = &ifra->ifra_addr.sin6_addr; + in6 = &ifra->ifra_addr.sin6_addr; if (memcmp(&in6addr_any.s6_addr[8], &in6->s6_addr[8], 8) != 0) { union { struct sockaddr_in6 sin6; @@ -250,9 +250,9 @@ setia6eui64_impl(prop_dictionary_t env, } } if (lladdr == NULL) - errx(EXIT_FAILURE, "could not determine link local address"); + errx(EXIT_FAILURE, "could not determine link local address"); - memcpy(&in6->s6_addr[8], &lladdr->s6_addr[8], 8); + memcpy(&in6->s6_addr[8], &lladdr->s6_addr[8], 8); freeifaddrs(ifap); return 0; Index: src/sbin/ifconfig/af_inetany.c diff -u src/sbin/ifconfig/af_inetany.c:1.17 src/sbin/ifconfig/af_inetany.c:1.18 --- src/sbin/ifconfig/af_inetany.c:1.17 Sun Dec 30 22:52:35 2012 +++ src/sbin/ifconfig/af_inetany.c Fri Aug 16 10:33:17 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: af_inetany.c,v 1.17 2012/12/30 22:52:35 christos Exp $ */ +/* $NetBSD: af_inetany.c,v 1.18 2019/08/16 10:33:17 msaitoh Exp $ */ /*- * Copyright (c) 2008 David Young. All rights reserved. @@ -27,14 +27,14 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: af_inetany.c,v 1.17 2012/12/30 22:52:35 christos Exp $"); +__RCSID("$NetBSD: af_inetany.c,v 1.18 2019/08/16 10:33:17 msaitoh Exp $"); #endif /* not lint */ -#include <sys/param.h> -#include <sys/ioctl.h> +#include <sys/param.h> +#include <sys/ioctl.h> #include <sys/socket.h> -#include <net/if.h> +#include <net/if.h> #include <netinet/in.h> #include <netinet/in_var.h> #include <netinet6/nd6.h> Index: src/sbin/ifconfig/util.c diff -u src/sbin/ifconfig/util.c:1.17 src/sbin/ifconfig/util.c:1.18 --- src/sbin/ifconfig/util.c:1.17 Sat Oct 19 00:35:30 2013 +++ src/sbin/ifconfig/util.c Fri Aug 16 10:33:17 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: util.c,v 1.17 2013/10/19 00:35:30 christos Exp $ */ +/* $NetBSD: util.c,v 1.18 2019/08/16 10:33:17 msaitoh Exp $ */ /*- * Copyright (c) 2008 David Young. All rights reserved. @@ -27,7 +27,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: util.c,v 1.17 2013/10/19 00:35:30 christos Exp $"); +__RCSID("$NetBSD: util.c,v 1.18 2019/08/16 10:33:17 msaitoh Exp $"); #endif /* not lint */ #include <ctype.h> @@ -160,9 +160,9 @@ struct paddr_prefix * prefixlen_to_mask(int af, int plen) { union { - struct sockaddr sa; - struct sockaddr_in sin; - struct sockaddr_in6 sin6; + struct sockaddr sa; + struct sockaddr_in sin; + struct sockaddr_in6 sin6; } u; struct paddr_prefix *pfx; size_t addrlen; Index: src/sbin/ifconfig/af_link.c diff -u src/sbin/ifconfig/af_link.c:1.7 src/sbin/ifconfig/af_link.c:1.8 --- src/sbin/ifconfig/af_link.c:1.7 Sun Jan 19 22:31:13 2014 +++ src/sbin/ifconfig/af_link.c Fri Aug 16 10:33:17 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: af_link.c,v 1.7 2014/01/19 22:31:13 matt Exp $ */ +/* $NetBSD: af_link.c,v 1.8 2019/08/16 10:33:17 msaitoh Exp $ */ /*- * Copyright (c) 2008 David Young. All rights reserved. @@ -27,15 +27,15 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: af_link.c,v 1.7 2014/01/19 22:31:13 matt Exp $"); +__RCSID("$NetBSD: af_link.c,v 1.8 2019/08/16 10:33:17 msaitoh Exp $"); #endif /* not lint */ -#include <sys/param.h> -#include <sys/ioctl.h> +#include <sys/param.h> +#include <sys/ioctl.h> #include <sys/socket.h> -#include <net/if.h> -#include <net/if_dl.h> +#include <net/if.h> +#include <net/if_dl.h> #include <assert.h> #include <err.h> Index: src/sbin/ifconfig/env.c diff -u src/sbin/ifconfig/env.c:1.11 src/sbin/ifconfig/env.c:1.12 --- src/sbin/ifconfig/env.c:1.11 Mon Mar 7 15:56:17 2016 +++ src/sbin/ifconfig/env.c Fri Aug 16 10:33:17 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: env.c,v 1.11 2016/03/07 15:56:17 christos Exp $ */ +/* $NetBSD: env.c,v 1.12 2019/08/16 10:33:17 msaitoh Exp $ */ /*- * Copyright (c) 2008 David Young. All rights reserved. @@ -27,7 +27,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: env.c,v 1.11 2016/03/07 15:56:17 christos Exp $"); +__RCSID("$NetBSD: env.c,v 1.12 2019/08/16 10:33:17 msaitoh Exp $"); #endif /* not lint */ #include <errno.h> @@ -138,7 +138,7 @@ getargdata(prop_dictionary_t env, const } datalen = prop_data_size(data); if (datalen > buflen) { - errno = ENAMETOOLONG; + errno = ENAMETOOLONG; return -1; } memcpy(buf, prop_data_data_nocopy(data), datalen); @@ -159,7 +159,7 @@ getargstr(prop_dictionary_t env, const c } datalen = prop_data_size(data); if (datalen >= buflen) { - errno = ENAMETOOLONG; + errno = ENAMETOOLONG; return -1; } memcpy(buf, prop_data_data_nocopy(data), datalen); Index: src/sbin/ifconfig/ether.c diff -u src/sbin/ifconfig/ether.c:1.6 src/sbin/ifconfig/ether.c:1.7 --- src/sbin/ifconfig/ether.c:1.6 Wed Jul 17 03:26:24 2019 +++ src/sbin/ifconfig/ether.c Fri Aug 16 10:33:17 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ether.c,v 1.6 2019/07/17 03:26:24 msaitoh Exp $ */ +/* $NetBSD: ether.c,v 1.7 2019/08/16 10:33:17 msaitoh Exp $ */ /* * Copyright (c) 1983, 1993 @@ -31,13 +31,13 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: ether.c,v 1.6 2019/07/17 03:26:24 msaitoh Exp $"); +__RCSID("$NetBSD: ether.c,v 1.7 2019/08/16 10:33:17 msaitoh Exp $"); #endif /* not lint */ -#include <sys/param.h> -#include <sys/ioctl.h> +#include <sys/param.h> +#include <sys/ioctl.h> -#include <net/if.h> +#include <net/if.h> #include <net/if_ether.h> #include <assert.h> Index: src/sbin/ifconfig/extern.h diff -u src/sbin/ifconfig/extern.h:1.15 src/sbin/ifconfig/extern.h:1.16 --- src/sbin/ifconfig/extern.h:1.15 Fri Dec 21 08:58:08 2018 +++ src/sbin/ifconfig/extern.h Fri Aug 16 10:33:17 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: extern.h,v 1.15 2018/12/21 08:58:08 msaitoh Exp $ */ +/* $NetBSD: extern.h,v 1.16 2019/08/16 10:33:17 msaitoh Exp $ */ /* * Copyright (c) 1983, 1993 @@ -34,7 +34,7 @@ #include <prop/proplib.h> #include "util.h" -#define RIDADDR 0 +#define RIDADDR 0 #define ADDR 1 #define MASK 2 #define DSTADDR 3 Index: src/sbin/ifconfig/ieee80211.c diff -u src/sbin/ifconfig/ieee80211.c:1.29 src/sbin/ifconfig/ieee80211.c:1.30 --- src/sbin/ifconfig/ieee80211.c:1.29 Thu Sep 22 18:22:51 2016 +++ src/sbin/ifconfig/ieee80211.c Fri Aug 16 10:33:17 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ieee80211.c,v 1.29 2016/09/22 18:22:51 christos Exp $ */ +/* $NetBSD: ieee80211.c,v 1.30 2019/08/16 10:33:17 msaitoh Exp $ */ /* * Copyright (c) 1983, 1993 @@ -31,7 +31,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: ieee80211.c,v 1.29 2016/09/22 18:22:51 christos Exp $"); +__RCSID("$NetBSD: ieee80211.c,v 1.30 2019/08/16 10:33:17 msaitoh Exp $"); #endif /* not lint */ #include <sys/param.h> @@ -470,7 +470,7 @@ scan_exec(prop_dictionary_t env, prop_di return -1; } - if ((ifr.ifr_flags & IFF_UP) == 0) + if ((ifr.ifr_flags & IFF_UP) == 0) errx(EXIT_FAILURE, "The interface must be up before scanning."); scan_and_wait(env); @@ -1191,7 +1191,7 @@ copy_essid(char buf[], size_t bufsize, c bufsize -= 2; } maxlen = i; - } else{ + } else { /* printable, truncate as needed */ strlcpy(buf, (const char *)essid, maxlen); } Index: src/sbin/ifconfig/ifconfig.c diff -u src/sbin/ifconfig/ifconfig.c:1.239 src/sbin/ifconfig/ifconfig.c:1.240 --- src/sbin/ifconfig/ifconfig.c:1.239 Thu Jul 4 02:45:45 2019 +++ src/sbin/ifconfig/ifconfig.c Fri Aug 16 10:33:17 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ifconfig.c,v 1.239 2019/07/04 02:45:45 ozaki-r Exp $ */ +/* $NetBSD: ifconfig.c,v 1.240 2019/08/16 10:33:17 msaitoh Exp $ */ /*- * Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc. @@ -63,7 +63,7 @@ #ifndef lint __COPYRIGHT("@(#) Copyright (c) 1983, 1993\ The Regents of the University of California. All rights reserved."); -__RCSID("$NetBSD: ifconfig.c,v 1.239 2019/07/04 02:45:45 ozaki-r Exp $"); +__RCSID("$NetBSD: ifconfig.c,v 1.240 2019/08/16 10:33:17 msaitoh Exp $"); #endif /* not lint */ #include <sys/param.h> @@ -1081,7 +1081,7 @@ setifflags(prop_dictionary_t env, prop_d rc = prop_dictionary_get_int64(env, "ifflag", &ifflag); assert(rc); - if (direct_ioctl(env, SIOCGIFFLAGS, &ifr) == -1) + if (direct_ioctl(env, SIOCGIFFLAGS, &ifr) == -1) return -1; if (ifflag < 0) { @@ -1487,31 +1487,31 @@ setifdescr(prop_dictionary_t env, prop_d prop_data_t data; char *descr; - data = (prop_data_t)prop_dictionary_get(env, "descr"); + data = (prop_data_t)prop_dictionary_get(env, "descr"); if (data == NULL) { errno = ENOENT; return -1; } len = prop_data_size(data) + 1; - if (len > IFDESCRSIZE) + if (len > IFDESCRSIZE) err(EXIT_FAILURE, "description too long"); - descr = malloc(len); + descr = malloc(len); if (descr == NULL) err(EXIT_FAILURE, "malloc description space"); if (getargstr(env, "descr", descr, len) == -1) errx(EXIT_FAILURE, "getargstr descr failed"); - ifr.ifr_buf = descr; + ifr.ifr_buf = descr; ifr.ifr_buflen = len; if (direct_ioctl(env, SIOCSIFDESCR, &ifr) != 0) err(EXIT_FAILURE, "SIOCSIFDESCR"); - free(descr); + free(descr); - return 0; + return 0; } static int @@ -1521,10 +1521,10 @@ unsetifdescr(prop_dictionary_t env, prop ifr.ifr_buf = NULL; ifr.ifr_buflen = 0; - if (direct_ioctl(env, SIOCSIFDESCR, &ifr) != 0) + if (direct_ioctl(env, SIOCSIFDESCR, &ifr) != 0) err(EXIT_FAILURE, "SIOCSIFDESCR"); - return 0; + return 0; } Index: src/sbin/ifconfig/parse.c diff -u src/sbin/ifconfig/parse.c:1.18 src/sbin/ifconfig/parse.c:1.19 --- src/sbin/ifconfig/parse.c:1.18 Wed Jul 17 15:42:03 2013 +++ src/sbin/ifconfig/parse.c Fri Aug 16 10:33:17 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: parse.c,v 1.18 2013/07/17 15:42:03 christos Exp $ */ +/* $NetBSD: parse.c,v 1.19 2019/08/16 10:33:17 msaitoh Exp $ */ /*- * Copyright (c) 2008 David Young. All rights reserved. @@ -27,7 +27,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: parse.c,v 1.18 2013/07/17 15:42:03 christos Exp $"); +__RCSID("$NetBSD: parse.c,v 1.19 2019/08/16 10:33:17 msaitoh Exp $"); #endif /* not lint */ #include <err.h> @@ -591,7 +591,7 @@ pbranch_match(const struct parser *p, co match_copy(om, &tmpm); match_cleanup(&tmpm); nmatch++; - dbg_warnx("%s: branch %s ok", __func__, nextp->p_name); + dbg_warnx("%s: branch %s ok", __func__, nextp->p_name); if (pb->pb_match_first) break; } else if (rc == 1) { @@ -600,7 +600,7 @@ pbranch_match(const struct parser *p, co break; } else { dbg_warnx("%s: fail branch %s", __func__, - nextp->p_name); + nextp->p_name); } } switch (nmatch) { @@ -608,7 +608,7 @@ pbranch_match(const struct parser *p, co errno = ENOENT; return (nforbid == 0) ? -1 : 1; case 1: - dbg_warnx("%s: branch ok", __func__); + dbg_warnx("%s: branch ok", __func__); return 0; default: match_cleanup(om); Index: src/sbin/ifconfig/parse.h diff -u src/sbin/ifconfig/parse.h:1.8 src/sbin/ifconfig/parse.h:1.9 --- src/sbin/ifconfig/parse.h:1.8 Sun Jun 30 11:38:16 2019 +++ src/sbin/ifconfig/parse.h Fri Aug 16 10:33:17 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: parse.h,v 1.8 2019/06/30 11:38:16 sevan Exp $ */ +/* $NetBSD: parse.h,v 1.9 2019/08/16 10:33:17 msaitoh Exp $ */ #ifndef _IFCONFIG_PARSE_H #define _IFCONFIG_PARSE_H @@ -252,7 +252,7 @@ struct paddr { const char *pa_activator; const char *pa_deactivator; }; - + struct piface { struct parser pif_parser; const char *pif_key; Index: src/sbin/ifconfig/pfsync.c diff -u src/sbin/ifconfig/pfsync.c:1.1 src/sbin/ifconfig/pfsync.c:1.2 --- src/sbin/ifconfig/pfsync.c:1.1 Mon Sep 14 10:36:49 2009 +++ src/sbin/ifconfig/pfsync.c Fri Aug 16 10:33:17 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: pfsync.c,v 1.1 2009/09/14 10:36:49 degroote Exp $ */ +/* $NetBSD: pfsync.c,v 1.2 2019/08/16 10:33:17 msaitoh Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. * All rights reserved. @@ -27,7 +27,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: pfsync.c,v 1.1 2009/09/14 10:36:49 degroote Exp $"); +__RCSID("$NetBSD: pfsync.c,v 1.2 2019/08/16 10:33:17 msaitoh Exp $"); #endif /* not lint */ #include <sys/param.h> @@ -199,7 +199,7 @@ setpfsync_peer(prop_dictionary_t env, pr memcpy(&pfsyncr.pfsyncr_syncpeer.s_addr, &s->sin_addr, MIN(sizeof(pfsyncr.pfsyncr_syncpeer.s_addr), - peerpfx->pfx_addr.sa_len)); + peerpfx->pfx_addr.sa_len)); } else { memset(&pfsyncr.pfsyncr_syncpeer.s_addr, 0, sizeof(pfsyncr.pfsyncr_syncpeer.s_addr)); Index: src/sbin/ifconfig/tunnel.c diff -u src/sbin/ifconfig/tunnel.c:1.20 src/sbin/ifconfig/tunnel.c:1.21 --- src/sbin/ifconfig/tunnel.c:1.20 Sat Oct 19 15:59:15 2013 +++ src/sbin/ifconfig/tunnel.c Fri Aug 16 10:33:17 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: tunnel.c,v 1.20 2013/10/19 15:59:15 christos Exp $ */ +/* $NetBSD: tunnel.c,v 1.21 2019/08/16 10:33:17 msaitoh Exp $ */ /* * Copyright (c) 1983, 1993 @@ -31,14 +31,14 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: tunnel.c,v 1.20 2013/10/19 15:59:15 christos Exp $"); +__RCSID("$NetBSD: tunnel.c,v 1.21 2019/08/16 10:33:17 msaitoh Exp $"); #endif /* not lint */ -#include <sys/param.h> -#include <sys/ioctl.h> +#include <sys/param.h> +#include <sys/ioctl.h> #include <sys/socket.h> -#include <net/if.h> +#include <net/if.h> #ifdef INET6 #include <netinet/in.h> Index: src/sbin/ifconfig/vlan.c diff -u src/sbin/ifconfig/vlan.c:1.14 src/sbin/ifconfig/vlan.c:1.15 --- src/sbin/ifconfig/vlan.c:1.14 Mon Sep 15 06:46:04 2014 +++ src/sbin/ifconfig/vlan.c Fri Aug 16 10:33:17 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: vlan.c,v 1.14 2014/09/15 06:46:04 ozaki-r Exp $ */ +/* $NetBSD: vlan.c,v 1.15 2019/08/16 10:33:17 msaitoh Exp $ */ /* * Copyright (c) 1983, 1993 @@ -31,13 +31,13 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: vlan.c,v 1.14 2014/09/15 06:46:04 ozaki-r Exp $"); +__RCSID("$NetBSD: vlan.c,v 1.15 2019/08/16 10:33:17 msaitoh Exp $"); #endif /* not lint */ -#include <sys/param.h> -#include <sys/ioctl.h> +#include <sys/param.h> +#include <sys/ioctl.h> -#include <net/if.h> +#include <net/if.h> #include <net/if_ether.h> #include <net/if_vlanvar.h>