projects
/
oweals
/
tinc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cc7c078
)
- Small fixes
author
Guus Sliepen
<guus@tinc-vpn.org>
Sun, 19 Nov 2000 22:12:46 +0000
(22:12 +0000)
committer
Guus Sliepen
<guus@tinc-vpn.org>
Sun, 19 Nov 2000 22:12:46 +0000
(22:12 +0000)
lib/rbl.c
patch
|
blob
|
history
lib/rbl.h
patch
|
blob
|
history
diff --git
a/lib/rbl.c
b/lib/rbl.c
index d79c5030726e47faf37f07c750dbb11be0069133..cf0316b77c376ebb52ab23220a7a43af9390893f 100644
(file)
--- a/
lib/rbl.c
+++ b/
lib/rbl.c
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: rbl.c,v 1.1.2.
6 2000/11/19 11:05:59
guus Exp $
+ $Id: rbl.c,v 1.1.2.
7 2000/11/19 22:12:46
guus Exp $
*/
#include <xalloc.h>
*/
#include <xalloc.h>
@@
-58,7
+58,7
@@
void free_rbltree(rbltree_t *tree)
}
/* Search closest match in the tree */
}
/* Search closest match in the tree */
-rbl_t *rbl_search_closest(rbltree_t *tree, void *data)
+rbl_t *rbl_search_closest
_rbl
(rbltree_t *tree, void *data)
{
rbl_t *rbl, *next;
int result;
{
rbl_t *rbl, *next;
int result;
@@
-82,8
+82,13
@@
rbl_t *rbl_search_closest(rbltree_t *tree, void *data)
return rbl;
}
return rbl;
}
+void *rbl_search_closest(rbltree_t *tree, void *data)
+{
+ return rbl_search_closest_rbl(tree, data)->data;
+}
+
/* Search exact match or return NULL pointer */
/* Search exact match or return NULL pointer */
-rbl_t *rbl_search(rbltree_t *tree, void *data)
+rbl_t *rbl_search
_rbl
(rbltree_t *tree, void *data)
{
rbl_t *rbl, *next;
int result;
{
rbl_t *rbl, *next;
int result;
@@
-107,6
+112,18
@@
rbl_t *rbl_search(rbltree_t *tree, void *data)
return NULL;
}
return NULL;
}
+void *rbl_search(rbltree_t *tree, void *data)
+{
+ rbl_t *rbl;
+
+ rbl = rbl_search_rbl(tree, data);
+
+ if(rbl)
+ return rbl->data;
+ else
+ return NULL;
+}
+
/* Red-black tree operations taken from Introduction to Algorithms,
Cormen, Leiserson & Rivest, chapter 14.
*/
/* Red-black tree operations taken from Introduction to Algorithms,
Cormen, Leiserson & Rivest, chapter 14.
*/
@@
-171,7
+188,7
@@
rbl_t *rbl_insert_rbl(rbltree_t *tree, rbl_t *rbl)
if(tree->top)
{
if(tree->top)
{
- closest = rbl_search_closest(tree, rbl->data);
+ closest = rbl_search_closest
_rbl
(tree, rbl->data);
result = tree->compare(rbl->data, closest->data);
if(result < 0)
{
result = tree->compare(rbl->data, closest->data);
if(result < 0)
{
@@
-423,7
+440,7
@@
rbl_t *rbl_unlink(rbltree_t *tree, void *data)
{
rbl_t *rbl;
{
rbl_t *rbl;
- rbl = rbl_search(tree, data);
+ rbl = rbl_search
_rbl
(tree, data);
if(rbl)
return rbl_unlink_rbl(rbl);
if(rbl)
return rbl_unlink_rbl(rbl);
@@
-457,10
+474,11
@@
rbl_unlink_rbltree_branch(rbl_t *rbl)
rbl->parent->left = NULL;
else
rbl->parent->right = NULL;
rbl->parent->left = NULL;
else
rbl->parent->right = NULL;
+ }
}
/* Optimized unlinking for a complete tree */
}
/* Optimized unlinking for a complete tree */
-rbl_unlink_rbltree(rbltree_t *tree)
+
void
rbl_unlink_rbltree(rbltree_t *tree)
{
rbl_t *rbl, *next;
{
rbl_t *rbl, *next;
@@
-481,14
+499,14
@@
rbl_unlink_rbltree(rbltree_t *tree)
}
/* Optimized deletion for a complete tree */
}
/* Optimized deletion for a complete tree */
-rbl_delete_rbltree(rbltree_t *tree)
+
void
rbl_delete_rbltree(rbltree_t *tree)
{
rbl_t *rbl, *next;
for(rbl = tree->head; rbl; rbl = next)
{
next = rbl->next;
{
rbl_t *rbl, *next;
for(rbl = tree->head; rbl; rbl = next)
{
next = rbl->next;
- tree->delete(rbl->data)
+ tree->delete(rbl->data)
;
}
tree->top = NULL;
}
tree->top = NULL;
diff --git
a/lib/rbl.h
b/lib/rbl.h
index 019ca2e1e920ac68099263bf83dd71b6b29dafa0..ab6b5f990bbb11a7ef8c0bd538a09ab419a74870 100644
(file)
--- a/
lib/rbl.h
+++ b/
lib/rbl.h
@@
-17,13
+17,9
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: rbl.h,v 1.1.2.
5 2000/11/19 11:05:59
guus Exp $
+ $Id: rbl.h,v 1.1.2.
6 2000/11/19 22:12:46
guus Exp $
*/
*/
-typedef int (*rbl_compare_t) (const void *, const void *);
-typedef void (*rbl_action_t) (const void *);
-typedef void (*rbl_action_rbl_t) (const struct rbl_t *);
-
typedef struct rbl_t
{
/* 'red-black tree' part */
typedef struct rbl_t
{
/* 'red-black tree' part */
@@
-47,6
+43,10
@@
typedef struct rbl_t
} rbl_t;
} rbl_t;
+typedef int (*rbl_compare_t) (const void *, const void *);
+typedef void (*rbl_action_t) (const void *);
+typedef void (*rbl_action_rbl_t) (const struct rbl_t *);
+
typedef struct rbltree_t
{
/* callback functions */
typedef struct rbltree_t
{
/* callback functions */
@@
-76,8
+76,10
@@
extern void free_rbltree(rbltree_t *);
extern rbl_t *new_rbl(void);
extern void free_rbl(rbl_t *);
extern rbl_t *new_rbl(void);
extern void free_rbl(rbl_t *);
-extern rbl_t *rbl_search(rbltree_t *, void *);
-extern rbl_t *rbl_search_closest(rbltree_t *, void *);
+extern void *rbl_search(rbltree_t *, void *);
+extern void *rbl_search_closest(rbltree_t *, void *);
+extern rbl_t *rbl_search_rbl(rbltree_t *, void *);
+extern rbl_t *rbl_search_closest_rbl(rbltree_t *, void *);
extern rbl_t *rbl_insert(rbltree_t *, void *);
extern rbl_t *rbl_unlink(rbltree_t *, void *);
extern void rbl_delete(rbltree_t *, void *);
extern rbl_t *rbl_insert(rbltree_t *, void *);
extern rbl_t *rbl_unlink(rbltree_t *, void *);
extern void rbl_delete(rbltree_t *, void *);