summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2003-12-19 19:24:09 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2003-12-19 19:24:09 +0000
commitffe0841aa86a1ac8085a9c1079b7e4659509f97e (patch)
treeb0e80d46e20a789a4fd169c5b52839211f86a21d
parentf5a904ee7f7cbc7aaefd3da390a58dd0b0a9f28f (diff)
knf
-rw-r--r--usr.sbin/bgpd/rde.c5
-rw-r--r--usr.sbin/bgpd/rde_prefix.c5
-rw-r--r--usr.sbin/bgpd/rde_rib.c8
3 files changed, 11 insertions, 7 deletions
diff --git a/usr.sbin/bgpd/rde.c b/usr.sbin/bgpd/rde.c
index e084b2299cf..5ce9c519d44 100644
--- a/usr.sbin/bgpd/rde.c
+++ b/usr.sbin/bgpd/rde.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rde.c,v 1.8 2003/12/19 16:46:46 claudio Exp $ */
+/* $OpenBSD: rde.c,v 1.9 2003/12/19 19:24:08 deraadt Exp $ */
/*
* Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
@@ -523,7 +523,8 @@ peer_init(struct bgpd_config *bgpconf, u_long hashsize)
struct peer *p, *next;
u_long hs, i;
- for (hs = 1; hs < hashsize; hs <<= 1) ;
+ for (hs = 1; hs < hashsize; hs <<= 1)
+ ;
peertable.peer_hashtbl = calloc(hs, sizeof(struct rde_peer_head));
if (peertable.peer_hashtbl == NULL)
fatal("peer_init", errno);
diff --git a/usr.sbin/bgpd/rde_prefix.c b/usr.sbin/bgpd/rde_prefix.c
index d996895da8e..c5624cc853c 100644
--- a/usr.sbin/bgpd/rde_prefix.c
+++ b/usr.sbin/bgpd/rde_prefix.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rde_prefix.c,v 1.1 2003/12/17 11:46:54 henning Exp $ */
+/* $OpenBSD: rde_prefix.c,v 1.2 2003/12/19 19:24:08 deraadt Exp $ */
/*
* Copyright (c) 2003 Claudio Jeker <cjeker@diehard.n-r-g.com>
@@ -188,7 +188,8 @@ pt_lookup(struct in_addr prefix)
PT_STAT(pt_lookup);
for (i = MAX_PREFIX; i >= MIN_PREFIX; i--) {
p = pt_get(prefix, i);
- if (p != NULL) return p;
+ if (p != NULL)
+ return p;
}
return NULL;
}
diff --git a/usr.sbin/bgpd/rde_rib.c b/usr.sbin/bgpd/rde_rib.c
index 8727bdbbac6..1185940b744 100644
--- a/usr.sbin/bgpd/rde_rib.c
+++ b/usr.sbin/bgpd/rde_rib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rde_rib.c,v 1.2 2003/12/19 01:15:47 deraadt Exp $ */
+/* $OpenBSD: rde_rib.c,v 1.3 2003/12/19 19:24:08 deraadt Exp $ */
/*
* Copyright (c) 2003 Claudio Jeker <cjeker@diehard.n-r-g.com>
@@ -372,7 +372,8 @@ path_init(u_long hashsize)
{
u_long hs, i;
- for (hs = 1; hs < hashsize; hs <<= 1) ;
+ for (hs = 1; hs < hashsize; hs <<= 1)
+ ;
pathtable.path_hashtbl = calloc(hs, sizeof(struct aspath_head));
if (pathtable.path_hashtbl == NULL)
fatal("path_init", errno);
@@ -892,7 +893,8 @@ nexthop_init(u_long hashsize)
{
u_long hs, i;
- for (hs = 1; hs < hashsize; hs <<= 1) ;
+ for (hs = 1; hs < hashsize; hs <<= 1)
+ ;
nexthoptable.nexthop_hashtbl = calloc(hs, sizeof(struct aspath_head));
if (nexthoptable.nexthop_hashtbl == NULL)
fatal("nextop_init", errno);