shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

Better const cast logic

Browse Source 
(although still gcc gives const violation warning)
This commit is contained in:
Zdenek Kabelac 2011-04-08 14:14:57 +00:00
parent 45109d497c
commit 040cdff1d4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/datastruct/btree.c
View File

@ -55,7 +55,7 @@ static uint32_t _shuffle(uint32_t k)
#endif #endif
} }
static struct node **_lookup(struct node *const *c, uint32_t key, static struct node *const *_lookup(struct node *const *c, uint32_t key,
struct node **p) struct node **p)
{ {
*p = NULL; *p = NULL;
@ -71,20 +71,20 @@ static struct node **_lookup(struct node *const *c, uint32_t key,
c = &(*c)->r; c = &(*c)->r;
} }
return (struct node **)c; return c;
} }
void *btree_lookup(const struct btree *t, uint32_t k) void *btree_lookup(const struct btree *t, uint32_t k)
{ {
uint32_t key = _shuffle(k); uint32_t key = _shuffle(k);
struct node *p, **c = _lookup(&t->root, key, &p); struct node *p, *const *c = _lookup(&t->root, key, &p);
return (*c) ? (*c)->data : NULL; return (*c) ? (*c)->data : NULL;
} }
int btree_insert(struct btree *t, uint32_t k, void *data) int btree_insert(struct btree *t, uint32_t k, void *data)
{ {
uint32_t key = _shuffle(k); uint32_t key = _shuffle(k);
struct node *p, **c = _lookup(&t->root, key, &p), *n; struct node *p, **c = (struct node **) _lookup(&t->root, key, &p), *n;
if (!*c) { if (!*c) {
if (!(n = dm_pool_alloc(t->mem, sizeof(*n)))) if (!(n = dm_pool_alloc(t->mem, sizeof(*n))))