diff options
author | Henning Brauer <henning@cvs.openbsd.org> | 2004-12-23 16:10:11 +0000 |
---|---|---|
committer | Henning Brauer <henning@cvs.openbsd.org> | 2004-12-23 16:10:11 +0000 |
commit | 6bda26cf25b330ed55caab77ea25152ed8030273 (patch) | |
tree | c994b72b39d665d8b2f1975c56c9cee7f486cca0 /usr.sbin | |
parent | dd81ccf99f9e69419caa2f6f43edbf619a182125 (diff) |
KNF
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/bgpd/mrt.c | 4 | ||||
-rw-r--r-- | usr.sbin/bgpd/parse.y | 4 | ||||
-rw-r--r-- | usr.sbin/bgpd/rde_filter.c | 4 | ||||
-rw-r--r-- | usr.sbin/ntpd/ntp.c | 3 |
4 files changed, 7 insertions, 8 deletions
diff --git a/usr.sbin/bgpd/mrt.c b/usr.sbin/bgpd/mrt.c index 6782b895727..446e9aeed30 100644 --- a/usr.sbin/bgpd/mrt.c +++ b/usr.sbin/bgpd/mrt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mrt.c,v 1.46 2004/11/11 13:06:44 claudio Exp $ */ +/* $OpenBSD: mrt.c,v 1.47 2004/12/23 16:09:26 henning Exp $ */ /* * Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org> @@ -308,7 +308,7 @@ mrt_dump_entry_mp(struct mrt *mrt, struct prefix *p, u_int16_t snum, attr_len = mrt_attr_length(p->aspath, 0); p_len = PREFIX_SIZE(p->prefix->prefixlen); pt_getaddr(p->prefix, &addr); - + af = peer->remote_addr.af == 0 ? addr.af : peer->remote_addr.af; switch (af) { case AF_INET: diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y index 1ea7b2f66bb..9fb235eb863 100644 --- a/usr.sbin/bgpd/parse.y +++ b/usr.sbin/bgpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.148 2004/11/23 13:07:01 claudio Exp $ */ +/* $OpenBSD: parse.y,v 1.149 2004/12/23 16:09:26 henning Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -2045,7 +2045,7 @@ merge_filterset(struct filter_set_head *sh, struct filter_set *s) SIMPLEQ_FOREACH(t, sh, entry) { if (s->type != t->type) continue; - + switch (s->type) { case ACTION_SET_COMMUNITY: if (s->action.community.as == t->action.community.as && diff --git a/usr.sbin/bgpd/rde_filter.c b/usr.sbin/bgpd/rde_filter.c index ce37a4f3009..135a413557d 100644 --- a/usr.sbin/bgpd/rde_filter.c +++ b/usr.sbin/bgpd/rde_filter.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde_filter.c,v 1.22 2004/11/23 13:07:01 claudio Exp $ */ +/* $OpenBSD: rde_filter.c,v 1.23 2004/12/23 16:09:26 henning Exp $ */ /* * Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org> @@ -99,7 +99,7 @@ rde_apply_set(struct rde_aspath *asp, struct filter_set_head *sh, asp->med = set->action.metric; case ACTION_SET_PREPEND_SELF: /* don't apply if this is a incoming default override */ - if (dir == DIR_DEFAULT_IN) + if (dir == DIR_DEFAULT_IN) break; as = rde_local_as(); prepend = set->action.prepend; diff --git a/usr.sbin/ntpd/ntp.c b/usr.sbin/ntpd/ntp.c index 2800a535063..85fad772fa4 100644 --- a/usr.sbin/ntpd/ntp.c +++ b/usr.sbin/ntpd/ntp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ntp.c,v 1.45 2004/12/22 05:34:52 henning Exp $ */ +/* $OpenBSD: ntp.c,v 1.46 2004/12/23 16:10:10 henning Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -143,7 +143,6 @@ ntp_main(int pipe_prnt[2], struct ntpd_conf *nconf) b = 1000000000 / tp.tv_nsec; /* convert to Hz */ for (a = 0; b > 1; a--, b >>= 1); conf->status.precision = a; - log_info("ntp engine ready"); |