Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.sbin/rtadvd White space police.
details: https://anonhg.NetBSD.org/src/rev/37fa4fa68634
branches: trunk
changeset: 318383:37fa4fa68634
user: roy <roy%NetBSD.org@localhost>
date: Fri Apr 20 10:39:37 2018 +0000
description:
White space police.
diffstat:
usr.sbin/rtadvd/config.c | 22 +++++++++++-----------
usr.sbin/rtadvd/config.h | 6 +++---
usr.sbin/rtadvd/dump.c | 8 ++++----
usr.sbin/rtadvd/dump.h | 6 +++---
usr.sbin/rtadvd/if.c | 10 +++++-----
usr.sbin/rtadvd/if.h | 6 +++---
usr.sbin/rtadvd/rrenum.h | 6 +++---
usr.sbin/rtadvd/rtadvd.c | 26 +++++++++++++-------------
usr.sbin/rtadvd/rtadvd.h | 10 +++++-----
usr.sbin/rtadvd/timer.c | 6 +++---
usr.sbin/rtadvd/timer.h | 6 +++---
11 files changed, 56 insertions(+), 56 deletions(-)
diffs (truncated from 475 to 300 lines):
diff -r 146b810d7f9a -r 37fa4fa68634 usr.sbin/rtadvd/config.c
--- a/usr.sbin/rtadvd/config.c Fri Apr 20 10:26:34 2018 +0000
+++ b/usr.sbin/rtadvd/config.c Fri Apr 20 10:39:37 2018 +0000
@@ -1,10 +1,10 @@
-/* $NetBSD: config.c,v 1.37 2017/11/06 15:15:04 christos Exp $ */
+/* $NetBSD: config.c,v 1.38 2018/04/20 10:39:37 roy Exp $ */
/* $KAME: config.c,v 1.93 2005/10/17 14:40:02 suz Exp $ */
/*
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -16,7 +16,7 @@
* 3. Neither the name of the project nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -97,7 +97,7 @@
src = p + 1;
}
*dst++ = '\0';
-
+
return dst - odst;
}
@@ -697,7 +697,7 @@
val64 > tmp->maxinterval * 2)
{
logit(LOG_ERR, "<%s> %s (%lld) on %s is invalid",
- __func__, entbuf, (long long)val64, intface);
+ __func__, entbuf, (long long)val64, intface);
goto errexit;
}
rdnss->lifetime = (uint32_t)val64;
@@ -733,7 +733,7 @@
val64 > tmp->maxinterval * 2)
{
logit(LOG_ERR, "<%s> %s (%lld) on %s is invalid",
- __func__, entbuf, (long long)val64, intface);
+ __func__, entbuf, (long long)val64, intface);
goto errexit;
}
dnssl->lifetime = (uint32_t)val64;
@@ -1123,8 +1123,8 @@
packlen += sizeof(struct nd_opt_prefix_info) * rainfo->pfxs;
if (rainfo->linkmtu)
packlen += sizeof(struct nd_opt_mtu);
- TAILQ_FOREACH(rti, &rainfo->route, next)
- packlen += sizeof(struct nd_opt_route_info) +
+ TAILQ_FOREACH(rti, &rainfo->route, next)
+ packlen += sizeof(struct nd_opt_route_info) +
((rti->prefixlen + 0x3f) >> 6) * 8;
TAILQ_FOREACH(rdns, &rainfo->rdnss, next) {
@@ -1200,7 +1200,7 @@
buf += sizeof(struct nd_opt_mtu);
}
- TAILQ_FOREACH(pfx, &rainfo->prefix, next) {
+ TAILQ_FOREACH(pfx, &rainfo->prefix, next) {
uint32_t vltime, pltime;
struct timespec now;
@@ -1273,7 +1273,7 @@
ndopt_rdnss->nd_opt_rdnss_reserved = 0;
ndopt_rdnss->nd_opt_rdnss_lifetime = htonl(rdns->lifetime);
buf += sizeof(*ndopt_rdnss);
-
+
TAILQ_FOREACH(rdnsa, &rdns->list, next) {
CHECKLEN(sizeof(rdnsa->addr));
memcpy(buf, &rdnsa->addr, sizeof(rdnsa->addr));
@@ -1290,7 +1290,7 @@
ndopt_dnssl->nd_opt_dnssl_reserved = 0;
ndopt_dnssl->nd_opt_dnssl_lifetime = htonl(dnsl->lifetime);
buf += sizeof(*ndopt_dnssl);
-
+
TAILQ_FOREACH(dnsd, &dnsl->list, next) {
CHECKLEN(dnsd->len);
memcpy(buf, dnsd->domain, dnsd->len);
diff -r 146b810d7f9a -r 37fa4fa68634 usr.sbin/rtadvd/config.h
--- a/usr.sbin/rtadvd/config.h Fri Apr 20 10:26:34 2018 +0000
+++ b/usr.sbin/rtadvd/config.h Fri Apr 20 10:39:37 2018 +0000
@@ -1,10 +1,10 @@
-/* $NetBSD: config.h,v 1.9 2012/12/13 15:36:36 roy Exp $ */
+/* $NetBSD: config.h,v 1.10 2018/04/20 10:39:37 roy Exp $ */
/* $KAME: config.h,v 1.9 2003/08/06 04:19:40 ono Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -16,7 +16,7 @@
* 3. Neither the name of the project nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff -r 146b810d7f9a -r 37fa4fa68634 usr.sbin/rtadvd/dump.c
--- a/usr.sbin/rtadvd/dump.c Fri Apr 20 10:26:34 2018 +0000
+++ b/usr.sbin/rtadvd/dump.c Fri Apr 20 10:39:37 2018 +0000
@@ -1,10 +1,10 @@
-/* $NetBSD: dump.c,v 1.15 2017/11/06 15:15:04 christos Exp $ */
+/* $NetBSD: dump.c,v 1.16 2018/04/20 10:39:37 roy Exp $ */
/* $KAME: dump.c,v 1.34 2004/06/14 05:35:59 itojun Exp $ */
/*
* Copyright (C) 2000 WIDE Project.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -16,7 +16,7 @@
* 3. Neither the name of the project nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -255,7 +255,7 @@
{
if (p != dnsd->domain)
fputc('.', fp);
- while(len-- != 0)
+ while(len-- != 0)
fputc(*p++, fp);
}
fputc('\n', fp);
diff -r 146b810d7f9a -r 37fa4fa68634 usr.sbin/rtadvd/dump.h
--- a/usr.sbin/rtadvd/dump.h Fri Apr 20 10:26:34 2018 +0000
+++ b/usr.sbin/rtadvd/dump.h Fri Apr 20 10:39:37 2018 +0000
@@ -1,10 +1,10 @@
-/* $NetBSD: dump.h,v 1.2 2011/12/10 19:14:29 roy Exp $ */
+/* $NetBSD: dump.h,v 1.3 2018/04/20 10:39:37 roy Exp $ */
/* $KAME: dump.h,v 1.1 2000/05/23 11:31:26 itojun Exp $ */
/*
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -16,7 +16,7 @@
* 3. Neither the name of the project nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff -r 146b810d7f9a -r 37fa4fa68634 usr.sbin/rtadvd/if.c
--- a/usr.sbin/rtadvd/if.c Fri Apr 20 10:26:34 2018 +0000
+++ b/usr.sbin/rtadvd/if.c Fri Apr 20 10:39:37 2018 +0000
@@ -1,10 +1,10 @@
-/* $NetBSD: if.c,v 1.25 2017/11/06 15:15:04 christos Exp $ */
+/* $NetBSD: if.c,v 1.26 2018/04/20 10:39:37 roy Exp $ */
/* $KAME: if.c,v 1.36 2004/11/30 22:32:01 suz Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -16,7 +16,7 @@
* 3. Neither the name of the project nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -68,7 +68,7 @@
get_rtaddrs(int addrs, struct sockaddr *sa, struct sockaddr **rti_info)
{
int i;
-
+
for (i = 0; i < RTAX_MAX; i++) {
if (addrs & (1 << i)) {
rti_info[i] = sa;
@@ -352,7 +352,7 @@
struct rt_msghdr *rtm = (struct rt_msghdr *)buf;
struct sockaddr *sa, *rti_info[RTAX_MAX];
unsigned char *p, *lim;
-
+
sa = (struct sockaddr *)(rtm + 1);
get_rtaddrs(rtm->rtm_addrs, sa, rti_info);
sa = rti_info[RTAX_NETMASK];
diff -r 146b810d7f9a -r 37fa4fa68634 usr.sbin/rtadvd/if.h
--- a/usr.sbin/rtadvd/if.h Fri Apr 20 10:26:34 2018 +0000
+++ b/usr.sbin/rtadvd/if.h Fri Apr 20 10:39:37 2018 +0000
@@ -1,10 +1,10 @@
-/* $NetBSD: if.h,v 1.10 2012/12/13 15:36:36 roy Exp $ */
+/* $NetBSD: if.h,v 1.11 2018/04/20 10:39:37 roy Exp $ */
/* $KAME: if.h,v 1.12 2003/09/21 07:17:03 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -16,7 +16,7 @@
* 3. Neither the name of the project nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff -r 146b810d7f9a -r 37fa4fa68634 usr.sbin/rtadvd/rrenum.h
--- a/usr.sbin/rtadvd/rrenum.h Fri Apr 20 10:26:34 2018 +0000
+++ b/usr.sbin/rtadvd/rrenum.h Fri Apr 20 10:39:37 2018 +0000
@@ -1,10 +1,10 @@
-/* $NetBSD: rrenum.h,v 1.5 2011/12/10 19:14:29 roy Exp $ */
+/* $NetBSD: rrenum.h,v 1.6 2018/04/20 10:39:37 roy Exp $ */
/* $KAME: rrenum.h,v 1.3 2001/01/21 15:37:14 itojun Exp $ */
/*
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -16,7 +16,7 @@
* 3. Neither the name of the project nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff -r 146b810d7f9a -r 37fa4fa68634 usr.sbin/rtadvd/rtadvd.c
--- a/usr.sbin/rtadvd/rtadvd.c Fri Apr 20 10:26:34 2018 +0000
+++ b/usr.sbin/rtadvd/rtadvd.c Fri Apr 20 10:39:37 2018 +0000
@@ -1,10 +1,10 @@
-/* $NetBSD: rtadvd.c,v 1.60 2018/04/20 10:26:34 roy Exp $ */
+/* $NetBSD: rtadvd.c,v 1.61 2018/04/20 10:39:37 roy Exp $ */
/* $KAME: rtadvd.c,v 1.92 2005/10/17 14:40:02 suz Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -16,7 +16,7 @@
* 3. Neither the name of the project nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -523,7 +523,7 @@
ifindex = get_ifan_ifindex(next);
if (get_ifan_what(next) == IFAN_ARRIVAL) {
logit(LOG_DEBUG,
- "%s: interface %s arrived",
+ "%s: interface %s arrived",
__func__,
if_indextoname(ifindex, ifname));
Home |
Main Index |
Thread Index |
Old Index