prototype everything

SCCS-vsn: sys/net/radix.h 7.9

diff --git a/usr/src/sys/net/radix.h b/usr/src/sys/net/radix.h
index 9555196..799f4a8 100644 (file)
--- a/usr/src/sys/net/radix.h
+++ b/usr/src/sys/net/radix.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)radix.h     7.8 (Berkeley) %G%
+ *     @(#)radix.h     7.9 (Berkeley) %G%

  */
 
 #ifndef _RADIX_H_
  */
 
 #ifndef _RADIX_H_


@@ -76,19 +76,19 @@ struct radix_node_head {
        int     rnh_addrsize;           /* permit, but not require fixed keys */
        int     rnh_pktsize;            /* permit, but not require fixed keys */
        struct  radix_node *(*rnh_addaddr)      /* add based on sockaddr */
        int     rnh_addrsize;           /* permit, but not require fixed keys */
        int     rnh_pktsize;            /* permit, but not require fixed keys */
        struct  radix_node *(*rnh_addaddr)      /* add based on sockaddr */

-               __P((caddr_t v, caddr_t mask,
+               __P((void *v, void *mask,

                     struct radix_node_head *head, struct radix_node nodes[]));
        struct  radix_node *(*rnh_addpkt)       /* add based on packet hdr */
                     struct radix_node_head *head, struct radix_node nodes[]));
        struct  radix_node *(*rnh_addpkt)       /* add based on packet hdr */

-               __P((caddr_t v, caddr_t mask,
+               __P((void *v, void *mask,

                     struct radix_node_head *head, struct radix_node nodes[]));
        struct  radix_node *(*rnh_deladdr)      /* remove based on sockaddr */
                     struct radix_node_head *head, struct radix_node nodes[]));
        struct  radix_node *(*rnh_deladdr)      /* remove based on sockaddr */

-               __P((caddr_t v, caddr_t mask, struct radix_node_head *head));
+               __P((void *v, void *mask, struct radix_node_head *head));

        struct  radix_node *(*rnh_delpkt)       /* remove based on packet hdr */
        struct  radix_node *(*rnh_delpkt)       /* remove based on packet hdr */

-               __P((caddr_t v, caddr_t mask, struct radix_node_head *head));
+               __P((void *v, void *mask, struct radix_node_head *head));

        struct  radix_node *(*rnh_matchaddr)    /* locate based on sockaddr */
        struct  radix_node *(*rnh_matchaddr)    /* locate based on sockaddr */

-               __P((caddr_t v, struct radix_node_head *head));
+               __P((void *v, struct radix_node_head *head));

        struct  radix_node *(*rnh_matchpkt)     /* locate based on packet hdr */
        struct  radix_node *(*rnh_matchpkt)     /* locate based on packet hdr */

-               __P((caddr_t v, struct radix_node_head *head));
+               __P((void *v, struct radix_node_head *head));

        int     (*rnh_walktree)                 /* traverse tree */
                __P((struct radix_node_head *head, int (*f)(), void *w));
        struct  radix_node rnh_nodes[3];        /* empty tree for common case */
        int     (*rnh_walktree)                 /* traverse tree */
                __P((struct radix_node_head *head, int (*f)(), void *w));
        struct  radix_node rnh_nodes[3];        /* empty tree for common case */


@@ -107,6 +107,21 @@ struct radix_node_head {
 #define R_Malloc(p, t, n) (p = (t) malloc((unsigned long)(n), M_RTABLE, M_DONTWAIT))
 #define Free(p) free((caddr_t)p, M_RTABLE);
 
 #define R_Malloc(p, t, n) (p = (t) malloc((unsigned long)(n), M_RTABLE, M_DONTWAIT))
 #define Free(p) free((caddr_t)p, M_RTABLE);
 

-int    rn_inithead __P((void **, int));
+void    rn_init __P((void));
+int     rn_inithead __P((void **, int));
+int     rn_refines __P((void *, void *));
+int     rn_walktree __P((struct radix_node_head *, int (*)(), void *));
+struct radix_node
+        *rn_addmask __P((void *, int, int)),
+        *rn_addroute __P((void *, void *, struct radix_node_head *,
+                       struct radix_node [2])),
+        *rn_delete __P((void *, void *, struct radix_node_head *)),
+        *rn_insert __P((void *, struct radix_node_head *, int *,
+                       struct radix_node [2])),
+        *rn_match __P((void *, struct radix_node_head *)),
+        *rn_newpair __P((void *, int, struct radix_node[2])),
+        *rn_search __P((void *, struct radix_node *)),
+        *rn_search_m __P((void *, struct radix_node *, void *));
+

 #endif /*KERNEL*/
 #endif /* _RADIX_H_ */
 #endif /*KERNEL*/
 #endif /* _RADIX_H_ */