From 894b6ab0099e7d9ca2ad9acb75246cd0a4542167 Mon Sep 17 00:00:00 2001
From: pat <>
Date: Wed, 30 Mar 2005 18:51:49 +0000
Subject: ansi + de-register

ok otto deraadt
---
 src/lib/libc/stdlib/tsearch.c | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

(limited to 'src/lib/libc/stdlib/tsearch.c')

diff --git a/src/lib/libc/stdlib/tsearch.c b/src/lib/libc/stdlib/tsearch.c
index 67388b4e7f..a5d0c2b9b3 100644
--- a/src/lib/libc/stdlib/tsearch.c
+++ b/src/lib/libc/stdlib/tsearch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tsearch.c,v 1.4 2004/10/01 04:08:45 jsg Exp $	*/
+/*	$OpenBSD: tsearch.c,v 1.5 2005/03/30 18:51:49 pat Exp $	*/
 
 /*
  * Tree search generalized from Knuth (6.2.2) Algorithm T just like
@@ -22,12 +22,10 @@ typedef struct node_t {
 
 /* find or insert datum into search tree */
 void *
-tsearch(vkey, vrootp, compar)
-	const void 	*vkey;		/* key to be located */
-	void		**vrootp;	/* address of tree root */
-	int		(*compar)(const void *, const void *);
+tsearch(const void *vkey, void **vrootp,
+    int (*compar)(const void *, const void *))
 {
-    register node *q;
+    node *q;
     char *key = (char *)vkey;
     node **rootp = (node **)vrootp;
 
@@ -53,16 +51,14 @@ tsearch(vkey, vrootp, compar)
 
 /* delete node with given key */
 void *
-tdelete(vkey, vrootp, compar)
-	const void	*vkey;		/* key to be deleted */
-	void		**vrootp;	/* address of the root of tree */
-	int		(*compar)(const void *, const void *);
+tdelete(const void *vkey, void **vrootp,
+    int (*compar)(const void *, const void *))
 {
     node **rootp = (node **)vrootp;
     char *key = (char *)vkey;
     node *p;
-    register node *q;
-    register node *r;
+    node *q;
+    node *r;
     int cmp;
 
     if (rootp == (struct node_t **)0 || (p = *rootp) == (struct node_t *)0)
@@ -97,10 +93,7 @@ tdelete(vkey, vrootp, compar)
 
 /* Walk the nodes of a tree */
 static void
-trecurse(root, action, level)
-	register node	*root;		/* Root of the tree to be walked */
-	register void	(*action)();	/* Function to be called at each node */
-	register int	level;
+trecurse(node *root, void (*action)(const void *, VISIT, int), int level)
 {
     if (root->left == (struct node_t *)0 && root->right == (struct node_t *)0)
 	(*action)(root, leaf, level);
@@ -117,12 +110,10 @@ trecurse(root, action, level)
 
 /* Walk the nodes of a tree */
 void
-twalk(vroot, action)
-	const void	*vroot;		/* Root of the tree to be walked */
-	void		(*action)(const void *, VISIT, int);
+twalk(const void *vroot, void (*action)(const void *, VISIT, int))
 {
     node *root = (node *)vroot;
 
-    if (root != (node *)0 && action != (void(*)())0)
+    if (root != (node *)0 && action != (void (*)(const void *, VISIT, int))0)
 	trecurse(root, action, 0);
 }
-- 
cgit v1.2.3-55-g6feb