pnx/archived
Archived
1
0
Fork 0
Code Activity

rbtree: removed unneeded typedefs

Browse source
This commit is contained in:
Henrik Hautakoski 2010-11-07 11:46:28 +01:00
parent d00fa63900
commit 39d4899c5a
2 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/rbtree.c
View file

@ -18,7 +18,7 @@
#define is_red(n) ((n) != NULL && (n)->color == RB_RED) #define is_red(n) ((n) != NULL && (n)->color == RB_RED)
#define swap(n,d,q) ((n)->child[(n)->child[d] == (q)]) #define swap(n,d,q) ((n)->child[(n)->child[d] == (q)])
static rbnode* node_alloc(uint key, void *data) { static rbnode* node_alloc(unsigned key, void *data) {
rbnode *n = xmalloc(sizeof(rbnode)); rbnode *n = xmalloc(sizeof(rbnode));
@ -103,7 +103,7 @@ inline int rbtree_is_empty(rbtree *tree) {
/* /*
* Searches a tree by key. * Searches a tree by key.
*/ */
rbnode* rbtree_search(rbtree *tree, uint key) { rbnode* rbtree_search(rbtree *tree, unsigned key) {
rbnode *n; rbnode *n;
@ -150,7 +150,7 @@ void rbtree_free(rbtree *tree) {
tree->root = NULL; tree->root = NULL;
} }
int rbtree_insert(rbtree *tree, uint key, void *data) { int rbtree_insert(rbtree *tree, unsigned key, void *data) {
rbnode head = {0}; rbnode head = {0};
@ -223,7 +223,7 @@ done:
return inserted; return inserted;
} }
int rbtree_delete(rbtree *tree, uint key) { int rbtree_delete(rbtree *tree, unsigned key) {
rbnode head = {0}; rbnode head = {0};

17
src/rbtree.h
View file

@ -16,15 +16,12 @@
#include <stddef.h> #include <stddef.h>
typedef unsigned char color_t;
typedef unsigned int uint;
/* node definition */ /* node definition */
typedef struct _rbn { typedef struct _rbn {
uint key; unsigned key;
void *data; void *data;
struct _rbn *child[2]; struct _rbn *child[2];
color_t color; unsigned char color;
} rbnode; } rbnode;
typedef struct { typedef struct {
@ -40,7 +37,7 @@ typedef struct {
int rbtree_is_empty(rbtree *tree); int rbtree_is_empty(rbtree *tree);
rbnode* rbtree_search(rbtree *tree, uint key); rbnode* rbtree_search(rbtree *tree, unsigned key);
rbnode* rbtree_cmp_search(rbtree *tree, const void *data); rbnode* rbtree_cmp_search(rbtree *tree, const void *data);
@ -48,8 +45,8 @@ void rbtree_walk(rbtree *tree, void (*action)(rbnode *));
void rbtree_free(rbtree *tree); void rbtree_free(rbtree *tree);
int rbtree_insert(rbtree *tree, uint key, void *data); int rbtree_insert(rbtree *tree, unsigned key, void *data);
int rbtree_delete(rbtree *tree, uint key); int rbtree_delete(rbtree *tree, unsigned key);
#endif /* __RBTREE_H */ #endif /* __RBTREE_H */