summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBret Lambert <blambert@cvs.openbsd.org>2012-07-10 15:53:35 +0000
committerBret Lambert <blambert@cvs.openbsd.org>2012-07-10 15:53:35 +0000
commitc0c0b30743a08a824c6d3ec2ea48590975aca611 (patch)
tree6326b84fe7f29aa65eb7b0ecf087455bb0c0d0a1
parent6e3f5d7fcfec3b55ee62ab38328885bbacaae56a (diff)
Place declarations for internal radix functions inside radix.c, stop
exporting them to the outside world via radix.h. ok claudio@ sthen@ henning@
-rw-r--r--sys/net/radix.c8
-rw-r--r--sys/net/radix.h8
2 files changed, 9 insertions, 7 deletions
diff --git a/sys/net/radix.c b/sys/net/radix.c
index b7be0e31e4e..642b3a52d66 100644
--- a/sys/net/radix.c
+++ b/sys/net/radix.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: radix.c,v 1.29 2011/07/22 13:05:29 henning Exp $ */
+/* $OpenBSD: radix.c,v 1.30 2012/07/10 15:53:34 blambert Exp $ */
/* $NetBSD: radix.c,v 1.20 2003/08/07 16:32:56 agc Exp $ */
/*
@@ -72,6 +72,12 @@ static int rn_lexobetter(void *, void *);
static struct radix_mask *rn_new_radix_mask(struct radix_node *,
struct radix_mask *);
+struct radix_node *rn_insert(void *, struct radix_node_head *, int *,
+ struct radix_node [2]);
+struct radix_node *rn_newpair(void *, int, struct radix_node[2]);
+struct radix_node *rn_search(void *, struct radix_node *);
+struct radix_node *rn_search_m(void *, struct radix_node *, void *);
+
/*
* The data structure for the keys is a radix tree with one way
* branching removed. The index rn_b at an internal node n represents a bit
diff --git a/sys/net/radix.h b/sys/net/radix.h
index ced0ef7d916..9462fb558bc 100644
--- a/sys/net/radix.h
+++ b/sys/net/radix.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: radix.h,v 1.17 2011/07/22 13:05:29 henning Exp $ */
+/* $OpenBSD: radix.h,v 1.18 2012/07/10 15:53:34 blambert Exp $ */
/* $NetBSD: radix.h,v 1.8 1996/02/13 22:00:37 christos Exp $ */
/*
@@ -150,12 +150,8 @@ struct radix_node *rn_addroute(void *, void *, struct radix_node_head *,
struct radix_node [2], u_int8_t);
struct radix_node *rn_delete(void *, void *, struct radix_node_head *,
struct radix_node *);
-struct radix_node *rn_insert(void *, struct radix_node_head *, int *,
- struct radix_node [2]);
struct radix_node *rn_lookup(void *, void *, struct radix_node_head *);
struct radix_node *rn_match(void *, struct radix_node_head *);
-struct radix_node *rn_newpair(void *, int, struct radix_node[2]);
-struct radix_node *rn_search(void *, struct radix_node *);
-struct radix_node *rn_search_m(void *, struct radix_node *, void *);
+
#endif /* _KERNEL */
#endif /* _NET_RADIX_H_ */